Merge pull request #8 from iWECon/dev

Update and fix some invalid code
iWECon · Jul 21, 2023 · 29b0d1c · 29b0d1c
2 parents 15a169b + b7bbe54
commit 29b0d1c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/Sources/Segmenter/Segment/Info/+ImageInfo.swift b/Sources/Segmenter/Segment/Info/+ImageInfo.swift
@@ -26,7 +26,12 @@ extension Segment {
         var activeSize: CGSize
         var inactiveSize: CGSize
 
-        init(activeImage: UIImage, inacitveImage: UIImage? = nil, activeSize: CGSize, inactiveSize: CGSize) {
+        init(
+            activeImage: UIImage,
+            inacitveImage: UIImage? = nil,
+            activeSize: CGSize,
+            inactiveSize: CGSize
+        ) {
             self.activeImage = activeImage
             self.activeSize = activeSize
             self.inactiveSize = inactiveSize

diff --git a/Sources/Segmenter/Segment/Info/+LabelInfo.swift b/Sources/Segmenter/Segment/Info/+LabelInfo.swift
@@ -5,12 +5,12 @@
 import UIKit
 
 public protocol SegmentLabelInfoProvider: SegmentInfoProvider {
-    var title: String? { get }
+    var title: String { get }
 
-    var activeFont: UIFont? { get }
-    var activeColor: UIColor? { get }
-    var inactiveFont: UIFont? { get }
-    var inactiveColor: UIColor? { get }
+    var activeFont: UIFont { get }
+    var activeColor: UIColor { get }
+    var inactiveFont: UIFont { get }
+    var inactiveColor: UIColor { get }
 }
 
 // MARK:- LabelInfo
@@ -21,14 +21,20 @@ extension Segment {
             Label.self
         }
 
-        var title: String?
+        var title: String
 
-        var activeFont: UIFont?
-        var activeColor: UIColor?
-        var inactiveFont: UIFont?
-        var inactiveColor: UIColor?
+        var activeFont: UIFont
+        var activeColor: UIColor
+        var inactiveFont: UIFont
+        var inactiveColor: UIColor
 
-        init(title: String, activeFont: UIFont? = nil, activeColor: UIColor? = nil, inactiveFont: UIFont? = nil, inactiveColor: UIColor? = nil) {
+        init(
+            title: String,
+            activeFont: UIFont = .systemFont(ofSize: 22, weight: .medium),
+            activeColor: UIColor = .darkText,
+            inactiveFont: UIFont = .systemFont(ofSize: 16),
+            inactiveColor: UIColor = .darkGray
+        ) {
             self.title = title
 
             self.activeFont = activeFont

diff --git a/Sources/Segmenter/Segment/Info/+ViewInfo.swift b/Sources/Segmenter/Segment/Info/+ViewInfo.swift
@@ -26,7 +26,12 @@ extension Segment {
         var activeSize: CGSize
         var inactiveSize: CGSize
 
-        init(activeView: UIView, inactiveView: UIView? = nil, activeSize: CGSize, inactiveSize: CGSize) {
+        init(
+            activeView: UIView,
+            inactiveView: UIView? = nil,
+            activeSize: CGSize,
+            inactiveSize: CGSize
+        ) {
             self.activeView = activeView
             self.inactiveView = inactiveView
 

diff --git a/...ter/Segment/Views/+Segment+Provider.swift → ...gmenter/Segment/SegmentViewProvider.swift b/...ter/Segment/Views/+Segment+Provider.swift → ...gmenter/Segment/SegmentViewProvider.swift
diff --git a/Sources/Segmenter/Segment/Views/+Segment+Image.swift b/Sources/Segmenter/Segment/Views/+Segment+Image.swift
@@ -23,9 +23,12 @@ extension Segment {
                 return imageView
             }
 
-            let viewInfo = _ViewInfo(activeView: makeImageView(info.activeImage)!,
-                                    inactiveView: makeImageView(info.inactiveImage),
-                                    activeSize: info.activeSize, inactiveSize: info.inactiveSize)
+            let viewInfo = _ViewInfo(
+                activeView: makeImageView(info.activeImage)!,
+                inactiveView: makeImageView(info.inactiveImage),
+                activeSize: info.activeSize,
+                inactiveSize: info.inactiveSize
+            )
             super.init(Segment(kind: .view(viewInfo)), info: viewInfo)
         }