Remove code for iOS versions below 11

richardtop · Mar 20, 2023 · 9b6f7e4 · 9b6f7e4
1 parent ca4050e
commit 9b6f7e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 33 deletions.
diff --git a/Sources/DayView.swift b/Sources/DayView.swift
@@ -109,22 +109,20 @@ public class DayView: UIView, TimelinePagerViewDelegate {
     }
 
     private func configureLayout() {
-        if #available(iOS 11.0, *) {
-            dayHeaderView.translatesAutoresizingMaskIntoConstraints = false
-            timelinePagerView.translatesAutoresizingMaskIntoConstraints = false
-
-            dayHeaderView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor).isActive = true
-            dayHeaderView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor).isActive = true
-            dayHeaderView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor).isActive = true
-            let heightConstraint = dayHeaderView.heightAnchor.constraint(equalToConstant: headerHeight)
-            heightConstraint.priority = .defaultLow
-            heightConstraint.isActive = true
-
-            timelinePagerView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor).isActive = true
-            timelinePagerView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor).isActive = true
-            timelinePagerView.topAnchor.constraint(equalTo: dayHeaderView.bottomAnchor).isActive = true
-            timelinePagerView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
-        }
+        dayHeaderView.translatesAutoresizingMaskIntoConstraints = false
+        timelinePagerView.translatesAutoresizingMaskIntoConstraints = false
+
+        dayHeaderView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor).isActive = true
+        dayHeaderView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor).isActive = true
+        dayHeaderView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor).isActive = true
+        let heightConstraint = dayHeaderView.heightAnchor.constraint(equalToConstant: headerHeight)
+        heightConstraint.priority = .defaultLow
+        heightConstraint.isActive = true
+
+        timelinePagerView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor).isActive = true
+        timelinePagerView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor).isActive = true
+        timelinePagerView.topAnchor.constraint(equalTo: dayHeaderView.bottomAnchor).isActive = true
+        timelinePagerView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
     }
 
     public func updateStyle(_ newStyle: CalendarStyle) {
@@ -153,17 +151,6 @@ public class DayView: UIView, TimelinePagerViewDelegate {
         state?.move(to: date)
     }
 
-    override public func layoutSubviews() {
-        super.layoutSubviews()
-        if #available(iOS 11, *) {} else {
-            dayHeaderView.frame = CGRect(origin: CGPoint(x: 0, y: layoutMargins.top),
-                                         size: CGSize(width: bounds.width, height: headerHeight))
-            let timelinePagerHeight = bounds.height - dayHeaderView.frame.maxY
-            timelinePagerView.frame = CGRect(origin: CGPoint(x: 0, y: dayHeaderView.frame.maxY),
-                                             size: CGSize(width: bounds.width, height: timelinePagerHeight))
-        }
-    }
-
     public func transitionToHorizontalSizeClass(_ sizeClass: UIUserInterfaceSizeClass) {
         dayHeaderView.transitionToHorizontalSizeClass(sizeClass)
         updateStyle(style)

diff --git a/Sources/Timeline/TimelineContainer.swift b/Sources/Timeline/TimelineContainer.swift
@@ -21,12 +21,7 @@ public final class TimelineContainer: UIScrollView {
 
         //adjust the scroll insets
         let allDayViewHeight = timeline.allDayViewHeight
-        let bottomSafeInset: Double
-        if #available(iOS 11.0, *) {
-            bottomSafeInset = Double(window?.safeAreaInsets.bottom ?? 0.0)
-        } else {
-            bottomSafeInset = 0
-        }
+        let bottomSafeInset = Double(window?.safeAreaInsets.bottom ?? 0.0)
         scrollIndicatorInsets = UIEdgeInsets(top: allDayViewHeight, left: 0, bottom: bottomSafeInset, right: 0)
         contentInset = UIEdgeInsets(top: allDayViewHeight, left: 0, bottom: bottomSafeInset, right: 0)
     }