Skip to content

Added colorViewMode property to MSColorSelectionViewController #11

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

Added colorViewMode property to MSColorSelectionViewController #11

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
daf4284
Added colorViewMode property to allow the color selection mode to be …
mdescalzo Mar 20, 2020
d1f3a4e
Forgot to set the colorViewMode. Fixed.
mdescalzo Mar 20, 2020
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
6 changes: 6 additions & 0 deletions MSColorPicker/MSColorSelectionViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
// THE SOFTWARE.

#import <UIKit/UIKit.h>
#import "MSColorSelectionView.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down Expand Up @@ -59,6 +60,11 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property (nonatomic, strong) UIColor *color;

/**
* The current colorView mode: RGB or HSB
*/
@property (nonatomic, assign) MSSelectedColorView colorViewMode;

@end

NS_ASSUME_NONNULL_END
31 changes: 25 additions & 6 deletions MSColorPicker/MSColorSelectionViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

@interface MSColorSelectionViewController () <MSColorViewDelegate>

@property (nonatomic, strong) UISegmentedControl *modeSelectionControl;

@end

@implementation MSColorSelectionViewController
Expand All @@ -46,26 +48,43 @@ - (void)viewDidLoad
{
[super viewDidLoad];

UISegmentedControl *segmentControl = [[UISegmentedControl alloc] initWithItems:@[NSLocalizedString(@"RGB", ), NSLocalizedString(@"HSB", )]];
[segmentControl addTarget:self action:@selector(segmentControlDidChangeValue:) forControlEvents:UIControlEventValueChanged];
segmentControl.selectedSegmentIndex = 0;
self.navigationItem.titleView = segmentControl;
self.navigationItem.titleView = self.modeSelectionControl;

[self.colorSelectionView setSelectedIndex:0 animated:NO];
[self.colorSelectionView setSelectedIndex:self.colorViewMode animated:NO];
self.colorSelectionView.delegate = self;
self.edgesForExtendedLayout = UIRectEdgeNone;
}

- (IBAction)segmentControlDidChangeValue:(UISegmentedControl *)segmentedControl
{
[self.colorSelectionView setSelectedIndex:segmentedControl.selectedSegmentIndex animated:YES];
if (segmentedControl == self.modeSelectionControl) {
self.colorViewMode = segmentedControl.selectedSegmentIndex;
}
}

- (void)setColor:(UIColor *)color
{
self.colorSelectionView.color = color;
}

- (void)setColorViewMode:(MSSelectedColorView)selectedColorViewMode
{
if (selectedColorViewMode != _colorViewMode) {
_colorViewMode = selectedColorViewMode;
[self.colorSelectionView setSelectedIndex:_colorViewMode animated:YES];
self.modeSelectionControl.selectedSegmentIndex = _colorViewMode;
}
}

-(UISegmentedControl *)modeSelectionControl {
if (_modeSelectionControl == nil) {
_modeSelectionControl = [[UISegmentedControl alloc] initWithItems:@[NSLocalizedString(@"RGB", ), NSLocalizedString(@"HSB", )]];
[_modeSelectionControl addTarget:self action:@selector(segmentControlDidChangeValue:) forControlEvents:UIControlEventValueChanged];
_modeSelectionControl.selectedSegmentIndex = self.colorViewMode;
}
return _modeSelectionControl;
}

- (UIColor *)color
{
return self.colorSelectionView.color;
Expand Down