Skip to content

proposed PR for issue https://github.com/iGenius-Srl/IGColorPicker/issues/7 #8

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
chrischenyc wants to merge 4 commits into
base: master
Choose a base branch
from
Open

proposed PR for issue https://github.com/iGenius-Srl/IGColorPicker/issues/7 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3560622
optional delegate method didDeselectItemAt isn't called when same col…
Sep 12, 2017
9f425c6
fix issue: optional delegate method didDeselectItemAt isn't called wh…
Sep 14, 2017
af19032
support deselect picker
Sep 15, 2017
fb26881
udpate M13Checkbox dependency version
Oct 6, 2017
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
7 changes: 6 additions & 1 deletion Example/IGColorPicker/SquareColorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SquareColorPickerViewController: UIViewController, ColorPickerViewDelegate
// Setup color picker
colorPickerView.delegate = self
colorPickerView.layoutDelegate = self
colorPickerView.isSelectedColorTappable = false
colorPickerView.isSelectedColorTappable = true
colorPickerView.style = .square
colorPickerView.selectionStyle = .check
colorPickerView.backgroundColor = .clear
Expand All @@ -38,9 +38,14 @@ class SquareColorPickerViewController: UIViewController, ColorPickerViewDelegate
// MARK: - ColorPickerViewDelegate

func colorPickerView(_ colorPickerView: ColorPickerView, didSelectItemAt indexPath: IndexPath) {
print("select index \(indexPath.item)")

self.view.backgroundColor = colorPickerView.colors[indexPath.item]
}

func colorPickerView(_ colorPickerView: ColorPickerView, didDeselectItemAt indexPath: IndexPath) {
print("deselect index \(indexPath.item)")
}

// MARK: - ColorPickerViewDelegateFlowLayout

Expand Down
2 changes: 1 addition & 1 deletion IGColorPicker.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ s.ios.deployment_target = '8.0'

s.source_files = 'IGColorPicker/Classes/**/*'

s.dependency 'M13Checkbox', '~> 2.2.0'
s.dependency 'M13Checkbox', '~> 3.2.1'
end
6 changes: 6 additions & 0 deletions IGColorPicker/Classes/View/ColorPickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ open class ColorPickerView: UIView, UICollectionViewDelegate, UICollectionViewDa
if let index = preselectedIndex {

guard index >= 0, colors.indices.contains(index) else {
if _indexOfSelectedColor != nil {
_indexOfSelectedColor = nil
collectionView.reloadData()
}

print("ERROR ColorPickerView - preselectedItem out of colors range")
return
}
Expand Down Expand Up @@ -129,6 +134,7 @@ open class ColorPickerView: UIView, UICollectionViewDelegate, UICollectionViewDa
if isSelectedColorTappable {
_indexOfSelectedColor = nil
colorPickerCell.checkbox.setCheckState(.unchecked, animated: animated)
delegate?.colorPickerView?(self, didDeselectItemAt: indexPath)
}
return
}
Expand Down