2.0.0 release

Bohr.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "Bohr"
-  s.version               = "1.0.1"
+  s.version               = "2.0.0"
   s.summary               = "Settings screen composing framework"
   s.homepage              = "https://github.com/DavdRoman/Bohr"
   s.author                = { "David Roman" => "d@vidroman.me" }

Bohr/BOButtonTableViewCell.h

@@ -10,6 +10,9 @@
 
 @interface BOButtonTableViewCell : BOTableViewCell
 
-+ (instancetype)cellWithTitle:(NSString *)title didTriggerBlock:(void (^)(void))didTriggerBlock;
+@property (nonatomic) id target;
+@property (nonatomic) SEL action;
+
+- (void)setTarget:(id)target action:(SEL)action;
 
 @end

Bohr/BOButtonTableViewCell.m

@@ -10,28 +10,26 @@
 
 #import "BOTableViewCell+Subclass.h"
 
-@interface BOButtonTableViewCell ()
-
-@property (nonatomic, copy) void(^didTriggerBlock)(void);
-
-@end
-
 @implementation BOButtonTableViewCell
 
-+ (instancetype)cellWithTitle:(NSString *)title didTriggerBlock:(void (^)(void))didTriggerBlock {
-	BOButtonTableViewCell *cell = [super cellWithTitle:title setting:nil];
-	cell.didTriggerBlock = didTriggerBlock;
-	return cell;
-}
-
 - (void)setup {
 	self.selectionStyle = UITableViewCellSelectionStyleDefault;
 	self.textLabel.textAlignment = NSTextAlignmentCenter;
 }
 
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+
 - (void)wasSelectedFromViewController:(BOTableViewController *)viewController {
 	[super wasSelectedFromViewController:viewController];
-	if (self.didTriggerBlock) self.didTriggerBlock();
+
+	if ([self.target respondsToSelector:self.action]) {
+		[self.target performSelector:self.action];
+	}
+}
+
+- (void)setTarget:(id)target action:(SEL)action {
+	self.target = target;
+	self.action = action;
 }
 
 @end

Bohr/BOChoiceTableViewCell.h

@@ -10,6 +10,8 @@
 
 @interface BOChoiceTableViewCell : BOTableViewCell
 
-+ (instancetype)cellWithTitle:(NSString *)title setting:(BOSetting *)setting options:(NSArray *)options;
+@property (nonatomic, strong) NSArray *options;
+
+@property (nonatomic, strong) IBInspectable NSArray *footerTitles;
 
 @end

Bohr/BOChoiceTableViewCell.m

@@ -10,33 +10,33 @@
 
 #import "BOTableViewCell+Subclass.h"
 
-@interface BOChoiceTableViewCell ()
-
-@property (nonatomic, strong) NSArray *options;
-
-@end
-
 @implementation BOChoiceTableViewCell
 
-+ (instancetype)cellWithTitle:(NSString *)title setting:(BOSetting *)setting options:(NSArray *)options {
-	BOChoiceTableViewCell *cell = [super cellWithTitle:title setting:setting];
-	cell.options = options;
-	return cell;
-}
-
 - (void)setup {
 	self.selectionStyle = UITableViewCellSelectionStyleDefault;
 }
 
+- (NSString *)footerTitle {
+	NSInteger currentOption = [self.setting.value integerValue];
+
+	if (currentOption < self.footerTitles.count) {
+		return self.footerTitles[currentOption];
+	}
+
+	return nil;
+}
+
 - (void)wasSelectedFromViewController:(BOTableViewController *)viewController {
 	[super wasSelectedFromViewController:viewController];
 
-	NSInteger currentOption = [self.setting.value integerValue];
-
-	if (currentOption < self.options.count-1) {
-		self.setting.value = @(currentOption+1);
-	} else {
-		self.setting.value = @0;
+	if (self.accessoryType != UITableViewCellAccessoryDisclosureIndicator) {
+		NSInteger currentOption = [self.setting.value integerValue];
+
+		if (currentOption < self.options.count-1) {
+			self.setting.value = @(currentOption+1);
+		} else {
+			self.setting.value = @0;
+		}
 	}
 }
 

Bohr/BOOptionTableViewCell.h

@@ -0,0 +1,15 @@
+//
+//  BOOptionTableViewCell.h
+//  Bohr
+//
+//  Created by David Román Aguirre on 21/6/15.
+//
+//
+
+#import "BOTableViewCell.h"
+
+@interface BOOptionTableViewCell : BOTableViewCell
+
+@property (nonatomic, strong) IBInspectable NSString *footerTitle;
+
+@end

Bohr/BOOptionTableViewCell.m

@@ -0,0 +1,36 @@
+//
+//  BOOptionTableViewCell.m
+//  Bohr
+//
+//  Created by David Román Aguirre on 21/6/15.
+//
+//
+
+#import "BOOptionTableViewCell.h"
+
+#import "BOTableViewCell+Subclass.h"
+
+@implementation BOOptionTableViewCell
+
+- (void)setup {
+	self.selectionStyle = UITableViewCellSelectionStyleDefault;
+}
+
+- (void)wasSelectedFromViewController:(BOTableViewController *)viewController {
+	[super wasSelectedFromViewController:viewController];
+
+	NSInteger optionIndex = [viewController.tableView indexPathForCell:self].row;
+	self.setting.value = @(optionIndex);
+}
+
+- (void)settingValueDidChange {
+	NSInteger optionIndex = [self.setting.value integerValue];
+
+    if (optionIndex == self.indexPath.row) {
+        self.accessoryType = UITableViewCellAccessoryCheckmark;
+    } else {
+        self.accessoryType = UITableViewCellAccessoryNone;
+    }
+}
+
+@end

Bohr/BOSetting.h

@@ -13,6 +13,6 @@
 @property (nonatomic, readonly) NSString *key;
 @property (nonatomic, assign) id value;
 
-+ (instancetype)settingWithDefaultValue:(id)defaultValue forKey:(NSString *)key;
++ (instancetype)settingWithKey:(NSString *)key;
 
 @end

Bohr/BOSetting.m

@@ -10,14 +10,13 @@
 
 @implementation BOSetting
 
-+ (instancetype)settingWithDefaultValue:(id)defaultValue forKey:(NSString *)key {
-	return [[self alloc] initWithDefaultValue:defaultValue forKey:key];
++ (instancetype)settingWithKey:(NSString *)key {
+	return [[self alloc] initWithKey:key];
 }
 
-- (instancetype)initWithDefaultValue:(id)defaultValue forKey:(NSString *)key {
+- (instancetype)initWithKey:(NSString *)key {
 	if (self = [super init]) {
 		_key = key;
-		[[NSUserDefaults standardUserDefaults] registerDefaults:@{self.key: defaultValue}];
 		[[NSUserDefaults standardUserDefaults] addObserver:self forKeyPath:self.key options:NSKeyValueObservingOptionNew context:nil];
 	}
 

Bohr/BOSwitchTableViewCell.h

@@ -12,4 +12,7 @@
 
 @property (nonatomic, strong) UISwitch *toggleSwitch;
 
+@property (nonatomic, strong) IBInspectable NSString *onFooterTitle;
+@property (nonatomic, strong) IBInspectable NSString *offFooterTitle;
+
 @end

Bohr/BOSwitchTableViewCell.m

@@ -28,12 +28,18 @@ - (void)updateAppearance {
 	self.toggleSwitch.onTintColor = self.secondaryColor;
 }
 
+- (NSString *)footerTitle {
+	BOOL settingValue = [self.setting.value boolValue];
+
+	return settingValue ? self.onFooterTitle : self.offFooterTitle;
+}
+
 - (void)toggleSwitchValueDidChange {
 	self.setting.value = @(self.toggleSwitch.on);
 }
 
 - (void)settingValueDidChange {
-	[self.toggleSwitch setOn:[self.setting.value boolValue] animated:self.superview];
+	[self.toggleSwitch setOn:[self.setting.value boolValue] animated:[UIView areAnimationsEnabled]];
 }
 
 @end

Bohr/BOTableViewCell+Subclass.h

@@ -9,13 +9,17 @@
 #import "BOTableViewCell.h"
 
 #import "BOTableViewController.h"
+#import "BOSetting.h"
 
 @interface BOTableViewCell ()
 
-@property (nonatomic) CGFloat expansionHeight;
+@property (nonatomic, strong) NSIndexPath *indexPath;
+@property (nonatomic, strong) BOSetting *setting;
 
 - (void)setup;
 - (void)updateAppearance;
+- (CGFloat)expansionHeight;
+- (NSString *)footerTitle;
 - (void)wasSelectedFromViewController:(BOTableViewController *)viewController;
 - (void)settingValueDidChange;
 

Bohr/BOTableViewCell.h

@@ -8,20 +8,16 @@
 
 #import <UIKit/UIKit.h>
 
-#import "BOSetting.h"
-
 @interface BOTableViewCell : UITableViewCell
 
-@property (nonatomic, strong) BOSetting *setting;
-
-@property (nonatomic, strong) UIColor *mainColor UI_APPEARANCE_SELECTOR;
-@property (nonatomic, strong) UIFont *mainFont UI_APPEARANCE_SELECTOR;
+@property (nonatomic, strong) IBInspectable NSString *key;
 
-@property (nonatomic, strong) UIColor *secondaryColor UI_APPEARANCE_SELECTOR;
-@property (nonatomic, strong) UIFont *secondaryFont UI_APPEARANCE_SELECTOR;
+@property (nonatomic, strong) IBInspectable UIColor *mainColor;
+@property (nonatomic, strong) UIFont *mainFont; // Apple pls rdar://19973159
 
-@property (nonatomic, strong) UIColor *selectedColor UI_APPEARANCE_SELECTOR;
+@property (nonatomic, strong) IBInspectable UIColor *secondaryColor;
+@property (nonatomic, strong) UIFont *secondaryFont;
 
-+ (instancetype)cellWithTitle:(NSString *)title setting:(BOSetting *)setting;
+@property (nonatomic, strong) IBInspectable UIColor *selectedColor;
 
 @end