0.1.3

Author: Geri-Borbas

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 	+ (May) lookup baseline reset issue with overflowing text
 
+* Feature/Label_Styles/0.1.3
+
+	+ Added scroll view to `PlanetViewController`
+	+ Matched inspection border to Figma
+
 * Feature/Label_Styles/0.1.2
 
 	+ UI from design specs (label styles, assets, stack)

UILabel_Typography_Extensions/Extensions/UIKit+Extensions.swift

@@ -46,8 +46,8 @@ extension UIView {
 		with {
 			$0.layer.borderWidth = 1
 			$0.layer.cornerRadius = 2
-			$0.layer.borderColor = UIColor.red.withAlphaComponent(0.3).cgColor
-			// $0.backgroundColor = UIColor.red.withAlphaComponent(0.1)
+			$0.layer.borderColor = UIColor.red.withAlphaComponent(0.6).cgColor
+			$0.backgroundColor = UIColor.red.withAlphaComponent(0.2)
 		}
 	}
 

UILabel_Typography_Extensions/Menu/MenuViewController.swift

@@ -84,7 +84,10 @@ class MenuViewController: UIViewController {
 
 	override func viewDidAppear(_ animated: Bool) {
 		super.viewDidAppear(animated)
-		self.present(PlanetViewController(), animated: true)
+		
+		self.present(PlanetViewController().with {
+			$0.modalPresentationStyle = .fullScreen
+		}, animated: true)
 	}
 }
 

UILabel_Typography_Extensions/Menu/Planet/PlanetViewController.swift

@@ -11,46 +11,57 @@ import SwiftUI
 
 class PlanetViewController: UIViewController {
 
-	lazy var heroLabel = UILabel().withHeroStyle
-	lazy var subtitleLabel = UILabel().withSubtitleStyle
-	lazy var image = UIImageView()
-	lazy var introLabel = UILabel().withIntroStyle
-	lazy var titleLabel = UILabel().withTitleStyle
-	lazy var paragraphLabel = UILabel().withParagraphStyle
+	lazy var heroLabel = UILabel().withHeroStyle.inspect
+	lazy var subtitleLabel = UILabel().withSubtitleStyle.inspect
+	lazy var image = UIImageView().inspect
+	lazy var introLabel = UILabel().withIntroStyle.inspect
+	lazy var titleLabel = UILabel().withTitleStyle.inspect
+	lazy var paragraphLabel = UILabel().withParagraphStyle.inspect
 
-	lazy var body = UIStackView()
-		.vertical(spacing: 5)
+	lazy var stackView = UIStackView()
+		.vertical(spacing: UI.StackView.spacing)
 		.views(
-			heroLabel
-				.inspect,
-			subtitleLabel
-				.inspect,
-			image
-				.inspect,
-			introLabel
-				.inspect,
-			titleLabel
-				.inspect,
+			heroLabel,
+			subtitleLabel,
+			image,
+			introLabel,
+			titleLabel,
 			paragraphLabel
-				.inspect,
-			UIView
-				.spacer
-				.inspect
 		)
 		.with {
-			$0.setCustomSpacing(25, after: introLabel)
-			$0.setCustomSpacing(25, after: titleLabel)
+			$0.setCustomSpacing(20 + 2 * UI.StackView.spacing, after: introLabel)
+			$0.setCustomSpacing(20 + 2 * UI.StackView.spacing, after: titleLabel)
+		}
+	
+	lazy var scrollView = UIScrollView()
+		.with {
+			$0.clipsToBounds = false
 		}
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
-		view.addSubview(body)
+		
+		// Colors.
 		view.backgroundColor = .background
 		overrideUserInterfaceStyle = .dark
-		body.pin(
+		
+		// Hierarchy.
+		view.addSubview(scrollView)
+		scrollView.addSubview(stackView)
+		scrollView.pin(
 			to: view.safeAreaLayoutGuide,
-			insets: UIEdgeInsets(top: 25, left: 25, bottom: 25, right: 25)
+			insets: .zero
+		)
+		stackView.pin(
+			to: scrollView,
+			insets: UI.padding
 		)
+		
+		// Vertical scrolling.
+		stackView.widthAnchor.constraint(
+			equalTo: scrollView.widthAnchor,
+			constant: -UI.padding.left - UI.padding.right
+		).isActive = true
 	}
 
 	override func viewWillAppear(_ animated: Bool) {

UILabel_Typography_Extensions/Menu/Planet/Styles.swift

@@ -9,6 +9,18 @@ import Foundation
 import UIKit
 
 
+struct UI {
+	
+	static let padding = UIEdgeInsets(top: 25, left: 25, bottom: 25, right: 25)
+	
+	struct StackView {
+		
+		static let spacing = CGFloat(5)
+		static let spacer = CGFloat(20)
+	}
+}
+
+
 extension UIColor {
 
 	static let background = UIColor(named: "Background") ?? UIColor.clear