Skip to content

A small refactoring #36

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
vraj-s-shah merged 1 commit into from
Nov 24, 2023
Merged

A small refactoring #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 13 additions & 21 deletions SSCustomTabBar/Classes/SSCustomTabBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,35 +199,27 @@ extension SSCustomTabBar {
extension SSCustomTabBar {

func setDefaultlayoutControlPoints(waveHeight: CGFloat, locationX: CGFloat) {
let width = (UIScreen.main.bounds.width/CGFloat(self.items?.count ?? 0))
leftPoint4.center = CGPoint(x: 0, y: minimalY+minimalHeight)
rightPoint4.center = CGPoint(x: self.bounds.width, y: minimalY+minimalHeight)
let imaginaryFrame = CGRect(x: locationX-(width/2), y: minimalY, width: width, height: minimalHeight)
leftPoint3.center = CGPoint(x: imaginaryFrame.minX, y: imaginaryFrame.maxY)
let topOffset: CGFloat = imaginaryFrame.width / 4.3
let bottomOffset: CGFloat = imaginaryFrame.width / 4.5
leftPoint2.center = CGPoint(x: imaginaryFrame.midX, y: imaginaryFrame.minY)
leftPoint1.center = CGPoint(x: imaginaryFrame.minX + bottomOffset, y: imaginaryFrame.maxY)
centerPoint1.center = CGPoint(x: imaginaryFrame.midX - topOffset, y: imaginaryFrame.minY)
centerPoint2.center = CGPoint(x: imaginaryFrame.maxX, y: imaginaryFrame.maxY)
rightPoint1.center = CGPoint(x: imaginaryFrame.midX + topOffset, y: imaginaryFrame.minY)
rightPoint2.center = CGPoint(x: imaginaryFrame.maxX - bottomOffset, y: imaginaryFrame.maxY)
setLayoutControlPoints(waveHeight: waveHeight, locationX: locationX, multiplier: 1)
}

func setReverselayoutControlPoints(waveHeight: CGFloat, locationX: CGFloat) {
setLayoutControlPoints(waveHeight: waveHeight, locationX: locationX, multiplier: -1)
}

private func setLayoutControlPoints(waveHeight: CGFloat, locationX: CGFloat, multiplier: CGFloat) {
let width = (UIScreen.main.bounds.width/CGFloat(self.items?.count ?? 0))
leftPoint4.center = CGPoint(x: 0, y: minimalY+minimalHeight)
rightPoint4.center = CGPoint(x: self.bounds.width, y: -(minimalY+minimalHeight))
rightPoint4.center = CGPoint(x: self.bounds.width, y: multiplier * (minimalY+minimalHeight))
let imaginaryFrame = CGRect(x: locationX-(width/2), y: minimalY, width: width, height: minimalHeight)
leftPoint3.center = CGPoint(x: imaginaryFrame.minX, y: -imaginaryFrame.maxY)
leftPoint3.center = CGPoint(x: imaginaryFrame.minX, y: multiplier * imaginaryFrame.maxY)
let topOffset: CGFloat = imaginaryFrame.width / 4.3
let bottomOffset: CGFloat = imaginaryFrame.width / 4.5
leftPoint2.center = CGPoint(x: imaginaryFrame.midX, y: -imaginaryFrame.minY)
leftPoint1.center = CGPoint(x: imaginaryFrame.minX + bottomOffset, y: -imaginaryFrame.maxY)
centerPoint1.center = CGPoint(x: imaginaryFrame.midX - topOffset, y: -imaginaryFrame.minY)
centerPoint2.center = CGPoint(x: imaginaryFrame.maxX, y: -imaginaryFrame.maxY)
rightPoint1.center = CGPoint(x: imaginaryFrame.midX + topOffset, y: -imaginaryFrame.minY)
rightPoint2.center = CGPoint(x: imaginaryFrame.maxX - bottomOffset, y: -imaginaryFrame.maxY)
leftPoint2.center = CGPoint(x: imaginaryFrame.midX, y: multiplier * imaginaryFrame.minY)
leftPoint1.center = CGPoint(x: imaginaryFrame.minX + bottomOffset, y: multiplier * imaginaryFrame.maxY)
centerPoint1.center = CGPoint(x: imaginaryFrame.midX - topOffset, y: multiplier * imaginaryFrame.minY)
centerPoint2.center = CGPoint(x: imaginaryFrame.maxX, y: multiplier * imaginaryFrame.maxY)
rightPoint1.center = CGPoint(x: imaginaryFrame.midX + topOffset, y: multiplier * imaginaryFrame.minY)
rightPoint2.center = CGPoint(x: imaginaryFrame.maxX - bottomOffset, y: multiplier * imaginaryFrame.maxY)
}

/// updateShapeLayer
Expand Down