2.1.0 release

davdroman · davdroman · commit 4180eb9ff9d2 · 2015-06-30T17:20:37.000+02:00
diff --git a/Bohr.podspec b/Bohr.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "Bohr"
-  s.version               = "2.0.1"
+  s.version               = "2.1.0"
   s.summary               = "Settings screen composing framework"
   s.homepage              = "https://github.com/DavdRoman/Bohr"
   s.author                = { "David Román" => "d@vidroman.me" }
diff --git a/Bohr/BOChoiceTableViewCell.m b/Bohr/BOChoiceTableViewCell.m
@@ -23,7 +23,7 @@ - (NSString *)footerTitle {
 		return self.footerTitles[currentOption];
 	}
 	
-	return nil;
+	return [super footerTitle];
 }
 
 - (void)wasSelectedFromViewController:(BOTableViewController *)viewController {
diff --git a/Bohr/BOSwitchTableViewCell.m b/Bohr/BOSwitchTableViewCell.m
@@ -29,9 +29,11 @@ - (void)updateAppearance {
 }
 
 - (NSString *)footerTitle {
-	BOOL settingValue = [self.setting.value boolValue];
+	if (self.onFooterTitle || self.offFooterTitle) {
+		return [self.setting.value boolValue] ? self.onFooterTitle : self.offFooterTitle;
+	}
 	
-	return settingValue ? self.onFooterTitle : self.offFooterTitle;
+	return [super footerTitle];
 }
 
 - (void)toggleSwitchValueDidChange {
diff --git a/Bohr/BOTableViewCell.h b/Bohr/BOTableViewCell.h
@@ -28,4 +28,7 @@
 /// The color for the selected state of the cell.
 @property (nonatomic, strong) IBInspectable UIColor *selectedColor;
 
+/// The default footer title for the cell.
+@property (nonatomic, strong) IBInspectable NSString *defaultFooterTitle;
+
 @end
diff --git a/Bohr/BOTableViewCell.m b/Bohr/BOTableViewCell.m
@@ -69,7 +69,7 @@ - (void)setup {}
 - (void)setupConstraints {}
 - (void)updateAppearance {}
 - (CGFloat)expansionHeight {return 0;}
-- (NSString *)footerTitle {return nil;}
+- (NSString *)footerTitle {return self.defaultFooterTitle;}
 - (void)wasSelectedFromViewController:(BOTableViewController *)viewController {}
 - (void)settingValueDidChange {}
 
diff --git a/Bohr/Info.plist b/Bohr/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.1</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/BohrDemo/Info.plist b/BohrDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.1</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/BohrDemo/Main.storyboard b/BohrDemo/Main.storyboard
@@ -9,7 +9,7 @@
             <objects>
                 <tableViewController id="8aG-sl-DjW" customClass="TableViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="58" sectionHeaderHeight="10" sectionFooterHeight="10" id="09h-NJ-dhl">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="566"/>
+                        <rect key="frame" x="0.0" y="64" width="600" height="549"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
                         <color key="backgroundColor" white="0.95999999999999996" alpha="1" colorSpace="calibratedWhite"/>
@@ -58,6 +58,7 @@
                                         <animations/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="string" keyPath="key" value="bool_2"/>
+                                            <userDefinedRuntimeAttribute type="string" keyPath="defaultFooterTitle" value="Footer"/>
                                             <userDefinedRuntimeAttribute type="string" keyPath="onFooterTitle" value="Switch setting 2 is on"/>
                                             <userDefinedRuntimeAttribute type="string" keyPath="offFooterTitle" value="Switch setting 2 is off"/>
                                         </userDefinedRuntimeAttributes>
@@ -185,7 +186,7 @@
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
-                            <tableViewSection headerTitle="Section 3" footerTitle="Static footer title" id="Icm-lX-mZf">
+                            <tableViewSection headerTitle="Section 3" footerTitle="" id="Icm-lX-mZf">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="DQG-u9-VyJ" style="IBUITableViewCellStyleDefault" id="2FQ-3G-mgv" customClass="BOButtonTableViewCell">
                                         <rect key="frame" x="0.0" y="79" width="600" height="44"/>
@@ -216,7 +217,7 @@
                     </tableView>
                     <navigationItem key="navigationItem" title="Bohr" id="2nX-kh-Bmg"/>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <size key="freeformSize" width="600" height="630"/>
+                    <size key="freeformSize" width="600" height="613"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="footerTitlesColor">
                             <color key="value" white="0.0" alpha="0.29999999999999999" colorSpace="calibratedWhite"/>
@@ -241,7 +242,7 @@
             <objects>
                 <tableViewController id="mPI-tq-cz0" customClass="BOTableViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="58" sectionHeaderHeight="10" sectionFooterHeight="10" id="UYq-iK-MLW">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="566"/>
+                        <rect key="frame" x="0.0" y="64" width="600" height="549"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
                         <color key="backgroundColor" white="0.95999999999999996" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/BohrDemo/TableViewController.m b/BohrDemo/TableViewController.m
@@ -15,6 +15,7 @@ - (void)setup {
 	self.choiceCell.options = @[@"Option 1", @"Option 2", @"Option 3"];
 	self.choiceDisclosureCell.options = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4"];
 	[self.buttonCell setTarget:self action:@selector(showButtonAlert)];
+	self.buttonCell.defaultFooterTitle = @"Static footer set programatically";
 }
 
 - (void)presentAlertControllerWithTitle:(NSString *)title message:(NSString *)message {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ - (NSString *)footerTitle {`
`23`	`23`	`return self.footerTitles[currentOption];`
`24`	`24`	`}`
`25`	`25`
`26`		`- return nil;`
	`26`	`+ return [super footerTitle];`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`- (void)wasSelectedFromViewController:(BOTableViewController *)viewController {`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,11 @@ - (void)updateAppearance {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`- (NSString *)footerTitle {`
`32`		`- BOOL settingValue = [self.setting.value boolValue];`
	`32`	`+ if (self.onFooterTitle \|\| self.offFooterTitle) {`
	`33`	`+ return [self.setting.value boolValue] ? self.onFooterTitle : self.offFooterTitle;`
	`34`	`+ }`
`33`	`35`
`34`		`- return settingValue ? self.onFooterTitle : self.offFooterTitle;`
	`36`	`+ return [super footerTitle];`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`- (void)toggleSwitchValueDidChange {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ - (void)setup {`
`15`	`15`	`self.choiceCell.options = @[@"Option 1", @"Option 2", @"Option 3"];`
`16`	`16`	`self.choiceDisclosureCell.options = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4"];`
`17`	`17`	`[self.buttonCell setTarget:self action:@selector(showButtonAlert)];`
	`18`	`+ self.buttonCell.defaultFooterTitle = @"Static footer set programatically";`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`- (void)presentAlertControllerWithTitle:(NSString )title message:(NSString )message {`