Skip to content
This repository was archived by the owner on Jun 4, 2025. It is now read-only.

Commit a7522a1

Browse files
committed
Merge pull request #69 from wordpress-mobile/issue/fixes-footer-height-calculation
Fixes WPTableViewSectionFooterView height calculation
2 parents 65541b6 + 34c7ee9 commit a7522a1

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
PODS:
2-
- AFNetworking (2.5.3):
3-
- AFNetworking/NSURLConnection (= 2.5.3)
4-
- AFNetworking/NSURLSession (= 2.5.3)
5-
- AFNetworking/Reachability (= 2.5.3)
6-
- AFNetworking/Security (= 2.5.3)
7-
- AFNetworking/Serialization (= 2.5.3)
8-
- AFNetworking/UIKit (= 2.5.3)
9-
- AFNetworking/NSURLConnection (2.5.3):
2+
- AFNetworking (2.5.4):
3+
- AFNetworking/NSURLConnection (= 2.5.4)
4+
- AFNetworking/NSURLSession (= 2.5.4)
5+
- AFNetworking/Reachability (= 2.5.4)
6+
- AFNetworking/Security (= 2.5.4)
7+
- AFNetworking/Serialization (= 2.5.4)
8+
- AFNetworking/UIKit (= 2.5.4)
9+
- AFNetworking/NSURLConnection (2.5.4):
1010
- AFNetworking/Reachability
1111
- AFNetworking/Security
1212
- AFNetworking/Serialization
13-
- AFNetworking/NSURLSession (2.5.3):
13+
- AFNetworking/NSURLSession (2.5.4):
1414
- AFNetworking/Reachability
1515
- AFNetworking/Security
1616
- AFNetworking/Serialization
17-
- AFNetworking/Reachability (2.5.3)
18-
- AFNetworking/Security (2.5.3)
19-
- AFNetworking/Serialization (2.5.3)
20-
- AFNetworking/UIKit (2.5.3):
17+
- AFNetworking/Reachability (2.5.4)
18+
- AFNetworking/Security (2.5.4)
19+
- AFNetworking/Serialization (2.5.4)
20+
- AFNetworking/UIKit (2.5.4):
2121
- AFNetworking/NSURLConnection
2222
- AFNetworking/NSURLSession
2323
- CocoaLumberjack (2.0.0):
@@ -28,20 +28,20 @@ PODS:
2828
- CocoaLumberjack/Core
2929
- CocoaLumberjack/Extensions (2.0.0):
3030
- CocoaLumberjack/Default
31-
- WordPress-iOS-Shared (0.3.2):
31+
- WordPress-iOS-Shared (0.3.5):
3232
- AFNetworking (~> 2.5)
33-
- CocoaLumberjack (~> 2.0)
33+
- CocoaLumberjack (= 2.0.0)
3434

3535
DEPENDENCIES:
3636
- WordPress-iOS-Shared (from `../`)
3737

3838
EXTERNAL SOURCES:
3939
WordPress-iOS-Shared:
40-
:path: "../"
40+
:path: ../
4141

4242
SPEC CHECKSUMS:
43-
AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
43+
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
4444
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
45-
WordPress-iOS-Shared: 0164a2cd656003e0e69c468a11d0bb8a5da43ab0
45+
WordPress-iOS-Shared: 155109cd666b8416ce0d2bdb2b8f6f6f6ec2ac50
4646

4747
COCOAPODS: 0.37.2

WordPress-iOS-Shared.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPress-iOS-Shared"
3-
s.version = "0.3.4"
3+
s.version = "0.3.5"
44
s.summary = "Shared components used in building the WordPress iOS apps and other library components."
55

66
s.description = <<-DESC

WordPress-iOS-Shared/Core/WPTableViewSectionFooterView.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ - (instancetype)initWithFrame:(CGRect)frame
2727
_titleLabel.font = [WPStyleGuide subtitleFont];
2828
_titleLabel.textColor = [WPStyleGuide greyDarken10];
2929
_titleLabel.backgroundColor = [UIColor clearColor];
30-
_titleLabel.shadowOffset = CGSizeMake(0.0, 0.0);
30+
_titleLabel.shadowOffset = CGSizeZero;
3131
[self addSubview:_titleLabel];
3232

3333
// fixed width should be enabled by default
@@ -65,7 +65,6 @@ - (void)layoutSubviews
6565
self.titleLabel.frame = CGRectIntegral(CGRectMake(padding, WPTableViewSectionFooterViewTopVerticalPadding, titleWidth, titleSize.height));
6666
}
6767

68-
// fixedWidth is enabled by default
6968
+ (CGFloat)heightForTitle:(NSString *)title andWidth:(CGFloat)width
7069
{
7170
return [self heightForTitle:title andWidth:width fixedWidthEnabled:YES];
@@ -85,7 +84,7 @@ + (CGFloat)heightForTitle:(NSString *)title andWidth:(CGFloat)width fixedWidthEn
8584

8685
+ (CGSize)sizeForTitle:(NSString *)title andTitleWidth:(CGFloat)titleWidth
8786
{
88-
return [title suggestedSizeWithFont:[WPStyleGuide tableviewSectionHeaderFont] width:titleWidth];
87+
return [title suggestedSizeWithFont:[WPStyleGuide subtitleFont] width:titleWidth];
8988
}
9089

9190
+ (CGFloat)titleLabelWidthFromSectionWidth:(CGFloat)sectionWidth fixedWidthEnabled:(BOOL)fixedWidthEnabled

0 commit comments

Comments
 (0)