Fix merge conflicts

Author: Badarinath Venkatnarayansetty

Example/Podfile.lock

@@ -4,7 +4,7 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - StepperView (1.0.4)
+  - StepperView (1.1.0)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (~> 2.1.4)
@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  StepperView: 3c1e9d67bfd4c73040e42b0488548ebaada5abc4
+  StepperView: 25478de5670fdd777852f8fe90461fabf0b13c4e
 
 PODFILE CHECKSUM: 9f7510adb19f7a52307ff19e961fb8365a7bc522
 

Example/Pods/Local Podspecs/StepperView.podspec.json

@@ -20,7 +20,7 @@ struct ExampleView3:View {
                   CustomView(text: "Select type of Account",imageName: "cash")
                 ]
 
-    let alignments = [StepperAlignment.top, .center, .bottom, .bottom]
+    let alignments = [StepperAlignment.center, .center, .center, .center]
 
     let indicationTypes = [
                 StepperIndicationType<AnyView>.circle(Colors.teal.rawValue,12),

Example/Pods/Manifest.lock

@@ -14,7 +14,7 @@ struct LineView: View {
     @Binding var lineXPosition:CGFloat
     @Binding var lineYPosition:CGFloat
     var options:StepperLineOptions
-    var alignment:StepperAlignment
+    var alignments:(StepperAlignment,StepperAlignment)
     var body:some View {
         switch options {
         case .defaults:
@@ -30,27 +30,30 @@ struct LineView: View {
                     .frame(width: width, height: lineHeight)
                     // X: subtract one pixel only if the width is 1
                     // Y: subtract half of the lineYposition to set to it's center position.
-                .offset(x: width == 1 ? lineXPosition/2 - Utils.halfSpacing - 1 : (lineXPosition/2 - Utils.halfSpacing) , y: getYOffsetPosition(for: self.alignment, and: lineYPosition))
+                    .offset(x: width == 1 ? lineXPosition/2 - Utils.halfSpacing - 1 : (lineXPosition/2 - Utils.halfSpacing),
+                        y: getYOffsetPosition(for: alignments.0, last: alignments.1, and: lineYPosition))
                     .padding()
                     .eraseToAnyView()
         }
     }
 
-    func getYOffsetPosition(for alignment: StepperAlignment,and offset: CGFloat ) -> CGFloat {
-        switch alignment {
-        case .top, .center:
-                print(lineYPosition - 2 * lineYPosition / 2)
-                return (lineYPosition -   lineYPosition / 2)
-        case .bottom:
-            print(lineYPosition + (lineYPosition / 2))
-            return lineYPosition + (lineYPosition / 2)
+    // returns Y offset position based on first and last alignments.
+    func getYOffsetPosition(for first: StepperAlignment,last: StepperAlignment, and offset: CGFloat ) -> CGFloat {
+        switch (first, last) {
+            //top variations
+            case (.top, .top): return -VerticalAlignment.centerValue
+            case (.top, .center) : return -(VerticalAlignment.centerValue / 2)
+            case (.top, .bottom): return (lineYPosition  - 2 * lineYPosition / 2)
+            
+            //center variations
+            case (.center, .top): return (lineYPosition - 3 * lineYPosition / 2)
+            case (.center, .center): return (lineYPosition - 2 * lineYPosition / 2)
+            case (.center, .bottom) : return (lineYPosition - lineYPosition / 2)
+              
+            //bottom variations
+            case (.bottom, .top): return (lineYPosition -  2 * lineYPosition / 2)
+            case (.bottom, .center): return (lineYPosition - 1.5 * lineYPosition / 2)
+            case (.bottom,.bottom):return (lineYPosition - lineYPosition / 2)
         }
     }
 }
-
-
-/*
-(.center, .center) = (lineYPosition - 2 * lineYPosition / 2)
-(.center, .bottom) =  (lineYPosition - lineYPosition / 2)
-(.top, .bottom) = (lineYPosition -   2 * lineYPosition / 2)
-*/

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -53,7 +53,7 @@ public struct StepperView<Cell>: View where Cell:View {
     public var body: some View {
         HStack {
             //line view to host indicator to point
-            LineView(lineHeight: $lineHeight, lineXPosition: $lineXPosition, lineYPosition: $lineYPosition, options: self.lineOptions, alignment: self.firstAlignment)
+            LineView(lineHeight: $lineHeight, lineXPosition: $lineXPosition, lineYPosition: $lineYPosition, options: self.lineOptions, alignments: (self.firstAlignment, self.lastAlignment))
             VStack(spacing: verticalSpacing) {
                 ForEach(self.cells.indices) { index in
                     HStack(alignment: self.getAlignment(type: self.alignments[index])) {
@@ -79,30 +79,59 @@ public struct StepperView<Cell>: View where Cell:View {
             .onPreferenceChange(VerticalHeightPreference.self){
                 print("Height of Divider \($0)")
                 let finalHeight = $0.values.max() ?? 0.0
-                self.lineHeight = finalHeight - self.bisectHeightsForFirstAndLastAlignments()
-                print("Line Height \(self.lineHeight)")
+                //print("Heights Based on First and Last alignments  \(self.calculateHeightsForFirstAndLastAlignments())")
+                self.lineHeight = finalHeight - self.calculateHeightsForFirstAndLastAlignments()
+                print("Final Line Height \(self.lineHeight)")
             }
         }.padding()
     }
 
-    /// calculate intermediate heights of the view.
+    // Calculate intermediate heights of the view.
     /// - Parameter value: dictionary to hold the index and height values.
     private func calculateIntermediateHeights( value: [Int:CGFloat] ) {
         self.columnHeights = value
         print("Intermediate Divider Height \(self.columnHeights)")
     }
 
-    
     // returns the first alignemnt from the array else .center by default
     private var firstAlignment: StepperAlignment {
         return self.alignments.first ?? .center
     }
 
+    // returns the last alignemnt from the array else .center by default
     public var lastAlignment: StepperAlignment {
         return self.alignments.last ?? .center
     }
-    
-    func bisectHeightsForFirstAndLastAlignments() -> CGFloat {
-        return (lastAlignment == .bottom) ?  self.getYPosition(for: self.firstAlignment) : 2 * self.getYPosition(for: self.firstAlignment)
+}
+
+//MARK:- Helper methods for StepperView
+@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+extension StepperView {
+    // Calculates the height based on first and last alignments.
+    func calculateHeightsForFirstAndLastAlignments() -> CGFloat {
+        if self.alignments.count > 1 {
+            switch (firstAlignment, lastAlignment) {
+                //Reduce 3 times to get actual height
+            case (.center, .top): return 3 * self.getYPosition(for: .center)
+                //Reduce 2 times to get actual height
+            case (.center, .center): return 2 * self.getYPosition(for: .center)
+                //Reduce 1 time to get actual height
+            case (.center, .bottom): return self.getYPosition(for: .center)
+                
+                //Reduce 1 time to get actual height
+                case (.top, .center): return self.getYPosition(for: .center)
+                case (.top, .bottom): return self.getYPosition(for: firstAlignment)
+                //Reduce 2 times to get actual height
+                case (.top, .top): return 2 * self.getYPosition(for: .center)
+                
+                //Reduce 2 times as it's messured from it's first alignment (.bottom isn this case)
+                case(.bottom, .top): return 2 * self.getYPosition(for: firstAlignment)
+                //Reduce 3 times to get actual height
+                case (.bottom, .center): return 3 * self.getYPosition(for: .center)
+                case (.bottom, .bottom): return self.getYPosition(for: firstAlignment)
+           }
+        } else {
+            return self.getYPosition(for: self.firstAlignment)
+       }
     }
 }

Example/Pods/Target Support Files/StepperView/StepperView-Info.plist

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'StepperView'
-  s.version          = '1.1.1'
+  s.version          = '1.1.2'
   s.swift_version    = '5.0'
   s.summary          = 'SwiftUI iOS component for Step Indications.'
   s.description      = 'Stepper View Indication componet for SwiftUI'