Skip to content

Accounting for alpha channel in tintColor itself for CHIPageControlAji and CHIPageControlJalapeno #75

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accounting for alpha channel in tintColor itself for CHIPageControlAji and CHIPageControlJalapeno #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a816e9
Take into account transparency of `tintColor` itself
yklishevich Feb 21, 2021
4da9f8f
Take into account transparency of `tintColor` for CHIPageControlAji
yklishevich Feb 23, 2021
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
4 changes: 4 additions & 0 deletions CHIPageControl.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
4313A8191E7A99F20015A568 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4313A7F01E7A92BB0015A568 /* CoreGraphics.framework */; };
4313A8251E7AA0310015A568 /* CHIBasePageControl.swift in Headers */ = {isa = PBXBuildFile; fileRef = 4313A7DD1E7A92320015A568 /* CHIBasePageControl.swift */; settings = {ATTRIBUTES = (Public, ); }; };
43EE766F1E7AA29E002140B5 /* CHIPageControlJaloro.swift in Headers */ = {isa = PBXBuildFile; fileRef = 4313A7D91E7A92320015A568 /* CHIPageControlJaloro.swift */; settings = {ATTRIBUTES = (Public, ); }; };
A3A87AA725E30C31001E382D /* UIColor+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A87AA625E30C31001E382D /* UIColor+Utils.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -46,6 +47,7 @@
4313A7EE1E7A92B30015A568 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
4313A7F01E7A92BB0015A568 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
4313A7F21E7A92C40015A568 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
A3A87AA625E30C31001E382D /* UIColor+Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Utils.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -104,6 +106,7 @@
4313A7DD1E7A92320015A568 /* CHIBasePageControl.swift */,
4313A7DE1E7A92320015A568 /* CHILayer.swift */,
4313A7DF1E7A92320015A568 /* CHIPageControllable.swift */,
A3A87AA625E30C31001E382D /* UIColor+Utils.swift */,
);
path = Core;
sourceTree = "<group>";
Expand Down Expand Up @@ -206,6 +209,7 @@
4313A7E61E7A92320015A568 /* CHIPageControlPaprika.swift in Sources */,
4313A7E31E7A92320015A568 /* CHIPageControlFresno.swift in Sources */,
4313A7E21E7A92320015A568 /* CHIPageControlChimayo.swift in Sources */,
A3A87AA725E30C31001E382D /* UIColor+Utils.swift in Sources */,
4313A7E41E7A92320015A568 /* CHIPageControlJalapeno.swift in Sources */,
4313A7E71E7A92320015A568 /* CHIPageControlPuya.swift in Sources */,
4313A7E81E7A92320015A568 /* CHIBasePageControl.swift in Sources */,
Expand Down
9 changes: 8 additions & 1 deletion CHIPageControl/CHIPageControlAji.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ open class CHIPageControlAji: CHIBasePageControl {
active.frame = frame

inactive.enumerated().forEach() { index, layer in
layer.backgroundColor = self.tintColor(position: index).withAlphaComponent(self.inactiveTransparency).cgColor
let tintColor = self.tintColor(position: index)
if let alpha = tintColor.alphaComponent {
layer.backgroundColor = tintColor.withAlphaComponent(alpha * self.inactiveTransparency).cgColor
}
else {
layer.backgroundColor = tintColor.withAlphaComponent(self.inactiveTransparency).cgColor
}

if self.borderWidth > 0 {
layer.borderWidth = self.borderWidth
layer.borderColor = self.tintColor(position: index).cgColor
Expand Down
8 changes: 7 additions & 1 deletion CHIPageControl/CHIPageControlJalapeno.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,13 @@ open class CHIPageControlJalapeno: CHIBasePageControl {
var frame = CGRect(x: x, y: y, width: self.diameter, height: self.diameter)

inactive.enumerated().forEach() { index, layer in
layer.backgroundColor = self.tintColor(position: index).withAlphaComponent(self.inactiveTransparency).cgColor
let tintColor = self.tintColor(position: index)
if let alpha = tintColor.alphaComponent {
layer.backgroundColor = tintColor.withAlphaComponent(alpha * self.inactiveTransparency).cgColor
}
else {
layer.backgroundColor = tintColor.withAlphaComponent(self.inactiveTransparency).cgColor
}
if self.borderWidth > 0 {
layer.borderWidth = self.borderWidth
layer.borderColor = self.tintColor(position: index).cgColor
Expand Down
23 changes: 23 additions & 0 deletions CHIPageControl/Core/UIColor+Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// UIColor+Utils.swift
// CHIPageControl
//
// Created by Yauheni Klishevich on 22.02.2021.
//

import UIKit

extension UIColor {

/// Returns `nil` if retrieving alpha component was impossible.
var alphaComponent: CGFloat? {
var alpha: CGFloat = 0
if getRed(nil, green: nil, blue: nil, alpha: &alpha) {
return alpha
}
else {
return nil
}
}

}