Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucdion merged 23 commits into from
Jun 30, 2020
Merged

Add automatic sizeThatFits computation for views #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9e3b4f8
Pod install
antoinelamy May 24, 2020
089ebe9
Working prototype
antoinelamy May 24, 2020
faeb598
Code review modifications
antoinelamy Jun 13, 2020
3437838
Revert "Adjust to Container Size" sample code
antoinelamy Jun 13, 2020
97aba2e
Change Travis target OS from 13.2 to 13.2.2
antoinelamy Jun 16, 2020
511be9e
Update test platform to xcode 11.5 iOS 13.5
antoinelamy Jun 16, 2020
9050899
Use tvOS 13.4
antoinelamy Jun 16, 2020
833a710
tvOS 13.4 (some refs remaining)
antoinelamy Jun 16, 2020
ff9caff
Again...
antoinelamy Jun 16, 2020
c55f4f6
Fix recursive usage of auto sizing
antoinelamy Jun 16, 2020
e959028
Fix rectWithMargins calculation on tvOS
antoinelamy Jun 16, 2020
57e25ec
Use PEdgeInsets instead of UIEdgeInsets
antoinelamy Jun 17, 2020
0544e17
Fix simulator versions
antoinelamy Jun 17, 2020
df408dc
Use consistent version of Swift across project
antoinelamy Jun 17, 2020
457b17b
Specify swift version in podspec
antoinelamy Jun 17, 2020
a9c4ae8
Put setRect in a else condition
antoinelamy Jun 25, 2020
c0890eb
Add AutoSizing Example
antoinelamy Jun 26, 2020
83d420d
Add documentation
antoinelamy Jun 26, 2020
bba716a
Move exemple in a more logical order
antoinelamy Jun 26, 2020
142acdf
Readme adjustments
antoinelamy Jun 26, 2020
b40beb7
Indent Readme with spaces instead of tabs
antoinelamy Jun 26, 2020
af7633d
Readme adjustments
antoinelamy Jun 26, 2020
b702f19
Wording
antoinelamy Jun 26, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
- bundler
Expand Down
32 changes: 28 additions & 4 deletions Example/PinLayoutSample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All@@ -183,7 +190,6 @@
160FB83905049FCEDD18DC8A /* Frameworks */ = {
isa = PBXGroup;
children = (
AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
246812FC1F8D013500462E53 /* NotificationCenter.framework */,
);
name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
24D18D181F3DECD6008129EF /* IntroRTL */,
2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
C892FA1124A582050086A75E /* AutoSizing */,
24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
);
path = Examples;
Expand All@@ -255,6 +262,8 @@
24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
C892FA1C24A584010086A75E /* ContentService.swift */,
C892FA2024A598170086A75E /* ProxyWrapper.swift */,
);
path = Common;
sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
path = Intro;
sourceTree = "<group>";
};
C892FA1124A582050086A75E /* AutoSizing */ = {
isa = PBXGroup;
children = (
C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
);
path = AutoSizing;
sourceTree = "<group>";
};
DF3908912118FFF20049FD56 /* Animations */ = {
isa = PBXGroup;
children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
41 changes: 41 additions & 0 deletions Example/PinLayoutSample/UI/Common/ContentService.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
static let shared = ContentService()

private init() {}

func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
guard let data = data, error == nil,
let paragraphs = try? JSONDecoder().decode([String].self, from: data)
else {
DispatchQueue.main.async {
completionHandler?(Result<[String], Error>.failure(error!))
}
return
}

DispatchQueue.main.async {
completionHandler?(Result<[String], Error>.success(paragraphs))
}
}.resume()
}

func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
guard let data = data, error == nil,
let image = UIImage(data: data)
else {
DispatchQueue.main.async {
completionHandler?(Result<UIImage, Error>.failure(error!))
}
return
}

DispatchQueue.main.async {
completionHandler?(Result<UIImage, Error>.success(image))
}
}.resume()
}
}
31 changes: 31 additions & 0 deletions Example/PinLayoutSample/UI/Common/ProxyWrapper.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
self.keyPath = keyPath
}

public var wrappedValue: Value {
get { fatalError() }
set { fatalError() }
}

public static subscript(
_enclosingInstance observed: EnclosingSelf,
wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
) -> Value {
get {
let storageValue = observed[keyPath: storageKeyPath]
let value = observed[keyPath: storageValue.keyPath]
return value
}
set {
let storageValue = observed[keyPath: storageKeyPath]
observed[keyPath: storageValue.keyPath] = newValue
}
}
}
68 changes: 68 additions & 0 deletions Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
private let imageView = UIImageView()
private let firstTextLabel = UILabel()
private let secondTextLabel = UILabel()

private let margin: CGFloat = 10

@Proxy(\AutoSizingContainerView.imageView.image)
var image: UIImage? {
didSet {
setNeedsLayout()
}
}

@Proxy(\AutoSizingContainerView.firstTextLabel.text)
var firstText: String? {
didSet {
setNeedsLayout()
}
}

@Proxy(\AutoSizingContainerView.secondTextLabel.text)
var secondText: String? {
didSet {
setNeedsLayout()
}
}

init() {
super.init(frame: CGRect.zero)
configureView()
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

private func configureView() {
imageView.clipsToBounds = true
imageView.contentMode = .scaleAspectFill
addSubview(imageView)

firstTextLabel.numberOfLines = 0
firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
addSubview(firstTextLabel)

secondTextLabel.numberOfLines = 0
secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
addSubview(secondTextLabel)
}

override func layoutSubviews() {
super.layoutSubviews()
performLayout()
}

private func performLayout() {
imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
}

override func sizeThatFits(_ size: CGSize) -> CGSize {
autoSizeThatFits(size, layoutClosure: performLayout)
}
}
54 changes: 54 additions & 0 deletions Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
private let scrollView = UIScrollView()
private let containerView = AutoSizingContainerView()

private let margin: CGFloat = 30

init() {
super.init(frame: CGRect.zero)
configureView()
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

private func configureView() {
backgroundColor = .white

scrollView.alwaysBounceVertical = true
addSubview(scrollView)

containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
scrollView.addSubview(containerView)
}

func updateImage(_ image: UIImage?) {
containerView.image = image
setNeedsLayout()
}

func updateTexts(firstText: String?, secondText: String?) {
containerView.firstText = firstText
containerView.secondText = secondText
setNeedsLayout()
}

override func layoutSubviews() {
super.layoutSubviews()
performLayout()
didPerformLayout()
}

private func performLayout() {
scrollView.pin.all()
containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
}

private func didPerformLayout() {
scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
}
}
39 changes: 39 additions & 0 deletions Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
private var mainView: AutoSizingView {
return self.view as! AutoSizingView
}

override func loadView() {
self.view = AutoSizingView()
}

override func viewDidLoad() {
super.viewDidLoad()
configureNavigationBar()
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
randomizeContent()
}

private func configureNavigationBar() {
navigationItem.title = "AutoSizing"
navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
}

@objc
private func randomizeContent() {
ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
guard let strongSelf = self, case let .success(paragraphs) = result else { return }
strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
}

ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
guard let strongSelf = self, case let .success(image) = result else { return }
strongSelf.mainView.updateImage(image)
}
}
}
4 changes: 4 additions & 0 deletions Example/PinLayoutSample/UI/Menu/MenuViewController.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
case between
case form
case wrapContent
case autoSizing
case tableViewWithReadable
case introRTL
case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
case .between: return "Between Example"
case .form: return "Form Example"
case .wrapContent: return "wrapContent Example"
case .autoSizing: return "Auto Sizing"
case .tableViewWithReadable: return "UITableView using readableMargins"
case .introRTL: return "Right-to-left Language Support"
case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
return FormViewController(pageType: self)
case .wrapContent:
return WrapContentViewController(pageType: self)
case .autoSizing:
return AutoSizingViewController()
case .tableViewWithReadable:
return TableViewReadableContentViewController(pageType: self)
case .introRTL:
Expand Down
1 change: 1 addition & 0 deletions PinLayout.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
spec.source_files = "Sources/**/*.swift"
spec.swift_version = '5.0'

spec.ios.deployment_target = '8.0'
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading
, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading

, '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
Add automatic sizeThatFits computation for views#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lucdion
merged 23 commits into

from

Jun 30, 2020
 Merged


Add automatic sizeThatFits computation for views
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
9e3b4f8

Pod install


antoinelamy May 24, 2020
089ebe9

Working prototype


antoinelamy May 24, 2020
faeb598

Code review modifications


antoinelamy Jun 13, 2020
3437838

Revert "Adjust to Container Size" sample code


antoinelamy Jun 13, 2020
97aba2e

Change Travis target OS from 13.2 to 13.2.2


antoinelamy Jun 16, 2020
511be9e

Update test platform to xcode 11.5 iOS 13.5


antoinelamy Jun 16, 2020
9050899

Use tvOS 13.4


antoinelamy Jun 16, 2020
833a710

tvOS 13.4 (some refs remaining)


antoinelamy Jun 16, 2020
ff9caff

Again...


antoinelamy Jun 16, 2020
c55f4f6

Fix recursive usage of auto sizing


antoinelamy Jun 16, 2020
e959028

Fix rectWithMargins calculation on tvOS


antoinelamy Jun 16, 2020
57e25ec

Use PEdgeInsets instead of UIEdgeInsets


antoinelamy Jun 17, 2020
0544e17

Fix simulator versions


antoinelamy Jun 17, 2020
df408dc

Use consistent version of Swift across project


antoinelamy Jun 17, 2020
457b17b

Specify swift version in podspec


antoinelamy Jun 17, 2020
a9c4ae8

Put setRect in a else condition


antoinelamy Jun 25, 2020
c0890eb

Add AutoSizing Example


antoinelamy Jun 26, 2020
83d420d

Add documentation


antoinelamy Jun 26, 2020
bba716a

Move exemple in a more logical order


antoinelamy Jun 26, 2020
142acdf

Readme adjustments


antoinelamy Jun 26, 2020
b40beb7

Indent Readme with spaces instead of tabs


antoinelamy Jun 26, 2020
af7633d

Readme adjustments


antoinelamy Jun 26, 2020
b702f19

Wording


antoinelamy Jun 26, 2020

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


2 changes: 1 addition & 1 deletion
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11.2
osx_image: xcode11.5

cache:
 - bundler
Expand Down

32 changes: 28 additions & 4 deletions
Example/PinLayoutSample.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,11 @@
 24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */; };
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA2024A598170086A75E /* ProxyWrapper.swift */; };
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390897211900320049FD56 /* AnimationsView.swift */; };
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF390899211900480049FD56 /* AnimationsViewController.swift */; };
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
Expand DownExpand Up@@ -148,8 +152,12 @@
 24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingView.swift; sourceTree = "<group>"; };
 C892FA1C24A584010086A75E /* ContentService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentService.swift; sourceTree = "<group>"; };
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingContainerView.swift; sourceTree = "<group>"; };
 C892FA2024A598170086A75E /* ProxyWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyWrapper.swift; sourceTree = "<group>"; };
 DF390897211900320049FD56 /* AnimationsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnimationsView.swift; path = PinLayoutSample/UI/Examples/Animations/AnimationsView.swift; sourceTree = SOURCE_ROOT; };
 DF390899211900480049FD56 /* AnimationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationsViewController.swift; sourceTree = "<group>"; };
 DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
Expand All@@ -173,7 +181,6 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
 DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
Expand All@@ -183,7 +190,6 @@
 160FB83905049FCEDD18DC8A /* Frameworks */ = {
 isa = PBXGroup;
 children = (
 AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */,
 246812FC1F8D013500462E53 /* NotificationCenter.framework */,
 );
 name = Frameworks;
Expand DownExpand Up@@ -240,6 +246,7 @@
 DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
 24D18D181F3DECD6008129EF /* IntroRTL */,
 2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
 C892FA1124A582050086A75E /* AutoSizing */,
 24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
 );
 path = Examples;
Expand All@@ -255,6 +262,8 @@
 24F246131FA8D57100B6332E /* UIImageView+Download.swift */,
 DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */,
 DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */,
 C892FA1C24A584010086A75E /* ContentService.swift */,
 C892FA2024A598170086A75E /* ProxyWrapper.swift */,
 );
 path = Common;
 sourceTree = "<group>";
Expand DownExpand Up@@ -399,6 +408,16 @@
 path = Intro;
 sourceTree = "<group>";
 };
 C892FA1124A582050086A75E /* AutoSizing */ = {
 isa = PBXGroup;
 children = (
 C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */,
 C892FA1A24A5822B0086A75E /* AutoSizingView.swift */,
 C892FA1E24A597FA0086A75E /* AutoSizingContainerView.swift */,
 );
 path = AutoSizing;
 sourceTree = "<group>";
 };
 DF3908912118FFF20049FD56 /* Animations */ = {
 isa = PBXGroup;
 children = (
Expand DownExpand Up@@ -661,10 +680,12 @@
 24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
 241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
 DF390898211900320049FD56 /* AnimationsView.swift in Sources */,
 C892FA2124A598170086A75E /* ProxyWrapper.swift in Sources */,
 2439CC541E665C6B003326FB /* RelativeView.swift in Sources */,
 2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */,
 247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
 24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
 C892FA1F24A597FA0086A75E /* AutoSizingContainerView.swift in Sources */,
 DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
 24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
 DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
Expand All@@ -681,6 +702,7 @@
 24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
 2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
 24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
 C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */,
 DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
 DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
 249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
Expand All@@ -693,9 +715,11 @@
 24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
 2439CC531E665C6B003326FB /* BetweenViewController.swift in Sources */,
 DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
 C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */,
 241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
 24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
 249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
 C892FA1D24A584010086A75E /* ContentService.swift in Sources */,
 DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
 DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
 2439CC521E665C6B003326FB /* BetweenView.swift in Sources */,
Expand Down

8 changes: 8 additions & 0 deletions
Example/PinLayoutSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plistversion="1.0">
<dict>
	<key>IDEDidComputeMac32BitWarning</key>
	<true/>
</dict>
</plist>

41 changes: 41 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ContentService.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import UIKit

class ContentService {
 static let shared = ContentService()

 private init() {}

 func fetchText(numberOfParagraph: Int = 1, completionHandler: ((Result<[String], Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconipsum.com/api/?type=all-meat&paras=\(numberOfParagraph)&start-with-lorem=1")!) { data, _, error in
 guard let data = data, error == nil,
 let paragraphs = try? JSONDecoder().decode([String].self, from: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<[String], Error>.success(paragraphs))
 }
 }.resume()
 }

 func fetchImage(width: Int, height: Int, completionHandler: ((Result<UIImage, Error>) -> Void)?) {
 URLSession.shared.dataTask(with: URL(string: "https://baconmockup.com/\(width)/\(height)")!) { data, _, error in
 guard let data = data, error == nil,
 let image = UIImage(data: data)
 else {
 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.failure(error!))
 }
 return
 }

 DispatchQueue.main.async {
 completionHandler?(Result<UIImage, Error>.success(image))
 }
 }.resume()
 }
}

31 changes: 31 additions & 0 deletions
Example/PinLayoutSample/UI/Common/ProxyWrapper.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import Foundation

@propertyWrapper
public struct Proxy<Value, EnclosingSelf> {
 private let keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>

 public init(_ keyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>) {
 self.keyPath = keyPath
 }

 public var wrappedValue: Value {
 get { fatalError() }
 set { fatalError() }
 }

 public static subscript(
 _enclosingInstance observed: EnclosingSelf,
 wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
 storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Self>
 ) -> Value {
 get {
 let storageValue = observed[keyPath: storageKeyPath]
 let value = observed[keyPath: storageValue.keyPath]
 return value
 }
 set {
 let storageValue = observed[keyPath: storageKeyPath]
 observed[keyPath: storageValue.keyPath] = newValue
 }
 }
}

68 changes: 68 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingContainerView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
import UIKit

final class AutoSizingContainerView: UIView {
 private let imageView = UIImageView()
 private let firstTextLabel = UILabel()
 private let secondTextLabel = UILabel()

 private let margin: CGFloat = 10

 @Proxy(\AutoSizingContainerView.imageView.image)
 var image: UIImage? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.firstTextLabel.text)
 var firstText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 @Proxy(\AutoSizingContainerView.secondTextLabel.text)
 var secondText: String? {
 didSet {
 setNeedsLayout()
 }
 }

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 imageView.clipsToBounds = true
 imageView.contentMode = .scaleAspectFill
 addSubview(imageView)

 firstTextLabel.numberOfLines = 0
 firstTextLabel.backgroundColor = UIColor.orange.withAlphaComponent(0.3)
 addSubview(firstTextLabel)

 secondTextLabel.numberOfLines = 0
 secondTextLabel.backgroundColor = UIColor.green.withAlphaComponent(0.3)
 addSubview(secondTextLabel)
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 }

 private func performLayout() {
 imageView.pin.top().horizontally().sizeToFit(.width).margin(margin)
 firstTextLabel.pin.below(of: imageView).horizontally().sizeToFit(.width).margin(margin)
 secondTextLabel.pin.below(of: firstTextLabel).horizontally().sizeToFit(.width).margin(margin)
 }

 override func sizeThatFits(_ size: CGSize) -> CGSize {
 autoSizeThatFits(size, layoutClosure: performLayout)
 }
}

54 changes: 54 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
import UIKit
import PinLayout

final class AutoSizingView: UIView {
 private let scrollView = UIScrollView()
 private let containerView = AutoSizingContainerView()

 private let margin: CGFloat = 30

 init() {
 super.init(frame: CGRect.zero)
 configureView()
 }

 required init?(coder: NSCoder) {
 fatalError("init(coder:) has not been implemented")
 }

 private func configureView() {
 backgroundColor = .white

 scrollView.alwaysBounceVertical = true
 addSubview(scrollView)

 containerView.backgroundColor = UIColor.lightGray.withAlphaComponent(0.3)
 scrollView.addSubview(containerView)
 }

 func updateImage(_ image: UIImage?) {
 containerView.image = image
 setNeedsLayout()
 }

 func updateTexts(firstText: String?, secondText: String?) {
 containerView.firstText = firstText
 containerView.secondText = secondText
 setNeedsLayout()
 }

 override func layoutSubviews() {
 super.layoutSubviews()
 performLayout()
 didPerformLayout()
 }

 private func performLayout() {
 scrollView.pin.all()
 containerView.pin.top(margin).horizontally(margin).sizeToFit(.width)
 }

 private func didPerformLayout() {
 scrollView.contentSize = CGSize(width: bounds.width, height: containerView.frame.maxY + margin)
 }
}

39 changes: 39 additions & 0 deletions
Example/PinLayoutSample/UI/Examples/AutoSizing/AutoSizingViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import UIKit

class AutoSizingViewController: UIViewController {
 private var mainView: AutoSizingView {
 return self.view as! AutoSizingView
 }

 override func loadView() {
 self.view = AutoSizingView()
 }

 override func viewDidLoad() {
 super.viewDidLoad()
 configureNavigationBar()
 }

 override func viewWillAppear(_ animated: Bool) {
 super.viewWillAppear(animated)
 randomizeContent()
 }

 private func configureNavigationBar() {
 navigationItem.title = "AutoSizing"
 navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Randomize", style: .plain, target: self, action: #selector(randomizeContent))
 }

 @objc
 private func randomizeContent() {
 ContentService.shared.fetchText(numberOfParagraph: 2) { [weak self] (result) in
 guard let strongSelf = self, case let .success(paragraphs) = result else { return }
 strongSelf.mainView.updateTexts(firstText: paragraphs[0], secondText: paragraphs[1])
 }

 ContentService.shared.fetchImage(width: Int.random(in: 200..<500), height: Int.random(in: 200..<500)) { [weak self] (result) in
 guard let strongSelf = self, case let .success(image) = result else { return }
 strongSelf.mainView.updateImage(image)
 }
 }
}

4 changes: 4 additions & 0 deletions
Example/PinLayoutSample/UI/Menu/MenuViewController.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ enum PageType: Int {
 case between
 case form
 case wrapContent
 case autoSizing
 case tableViewWithReadable
 case introRTL
 case introObjC
Expand All@@ -50,6 +51,7 @@ enum PageType: Int {
 case .between: return "Between Example"
 case .form: return "Form Example"
 case .wrapContent: return "wrapContent Example"
 case .autoSizing: return "Auto Sizing"
 case .tableViewWithReadable: return "UITableView using readableMargins"
 case .introRTL: return "Right-to-left Language Support"
 case .introObjC: return "Objective-C PinLayout Example"
Expand DownExpand Up@@ -84,6 +86,8 @@ enum PageType: Int {
 return FormViewController(pageType: self)
 case .wrapContent:
 return WrapContentViewController(pageType: self)
 case .autoSizing:
 return AutoSizingViewController()
 case .tableViewWithReadable:
 return TableViewReadableContentViewController(pageType: self)
 case .introRTL:
Expand Down

1 change: 1 addition & 0 deletions
PinLayout.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ Pod::Spec.new do |spec|
 spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
 spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
 spec.source_files = "Sources/**/*.swift"
 spec.swift_version = '5.0'

 spec.ios.deployment_target = '8.0'
 spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
Loading