Better abstraction of settings controller responsibilities.

fcanas · Dec 17, 2012 · adbbf64 · adbbf64
1 parent 8cfee48
commit adbbf64
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/FCSettingsBooster/FCBoosterCell.h b/FCSettingsBooster/FCBoosterCell.h
@@ -7,7 +7,13 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "FCSettingsViewController.h"
+
+@protocol FCSettingsBoosterController <NSObject>
+
+@property (nonatomic, strong) NSString *controllerKey;
+
+@end
+
 
 @protocol FCBoosterCell <NSObject>
 
@@ -18,6 +24,6 @@
 
 @optional
 
-- (id)valueControllerForSettingsController:(FCSettingsViewController *)settingsController;
+- (id)valueControllerForSettingsController:(id<FCSettingsBoosterController>)settingsController;
 
 @end
diff --git a/FCSettingsBooster/FCColorPickerCell.m b/FCSettingsBooster/FCColorPickerCell.m
@@ -56,19 +56,14 @@ - (void)setLabelText:(NSString *)labelText {
   self.textLabel.text = labelText;
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-//  [super setSelected:selected animated:animated];
-}
-
-- (id)valueControllerForSettingsController:(FCSettingsViewController *)settingsController {
+- (id)valueControllerForSettingsController:(id<FCSettingsBoosterController>)settingsController {
   FCColorPickerViewController *c = [[FCColorPickerViewController alloc] initWithNibName:@"FCColorPickerViewController" bundle:nil] ;
 
   settingsController.controllerKey = self.key;
   c.color = [[NSUserDefaults standardUserDefaults] colorForKey:self.key];
 
   if ([settingsController conformsToProtocol:@protocol(ColorPickerViewControllerDelegate)]) {
-    c.delegate = settingsController;
+    c.delegate = (id<ColorPickerViewControllerDelegate>)settingsController;
   }
 
   return c;

diff --git a/FCSettingsBooster/FCSettingsViewController.h b/FCSettingsBooster/FCSettingsViewController.h
@@ -9,9 +9,9 @@
 #import <UIKit/UIKit.h>
 #import <iOS-Color-Picker/FCColorPickerViewController.h>
 
-@interface FCSettingsViewController : UITableViewController <ColorPickerViewControllerDelegate>
+#import "FCBoosterCell.h"
 
-@property (nonatomic, strong) NSString *controllerKey;
+@interface FCSettingsViewController : UITableViewController <ColorPickerViewControllerDelegate,FCSettingsBoosterController>
 
 - (id)initWithConfiguration:(NSArray *) config andStyle:(UITableViewStyle)style;
 

diff --git a/FCSettingsBooster/FCSettingsViewController.m b/FCSettingsBooster/FCSettingsViewController.m
@@ -11,12 +11,16 @@
 #import "FCColorPickerCell.h"
 #import "NSUserDefaults+UIColor.h"
 
-@interface FCSettingsViewController ()
+@interface FCSettingsViewController () {
+  NSString *controllerKey;
+}
 @property (nonatomic, strong) NSArray *configuration;
 @end
 
 @implementation FCSettingsViewController
 
+@synthesize controllerKey=_controllerKey;
+
 - (id)initWithConfiguration:(NSArray *) config andStyle:(UITableViewStyle)style {
   self = [super initWithStyle:style];
   if (self) {