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

Commit 5ceed83

Browse files
committed
Merge branch 'release/0.3.4'
2 parents 45d2658 + 4df3189 commit 5ceed83

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

Example/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- WPMediaPicker (0.3.3)
2+
- WPMediaPicker (0.3.4)
33

44
DEPENDENCIES:
55
- WPMediaPicker (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
99
:path: ../
1010

1111
SPEC CHECKSUMS:
12-
WPMediaPicker: 3397de209862de5ae02a36d2ed5b8c57a4300f9d
12+
WPMediaPicker: d1137b5447f1fb92cbed08742d8587b8c12c4d05
1313

14-
COCOAPODS: 0.36.4
14+
COCOAPODS: 0.37.1

Example/WPMediaPicker/AppDelegate.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1616
[[UINavigationBar appearance] setBarTintColor:[UIColor colorWithRed:0/255.0f green:135/255.0f blue:190/255.0f alpha:1.0f]];
1717
[[UINavigationBar appearance] setTintColor:[UIColor whiteColor]];
1818
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor whiteColor]} ];
19-
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
2019
[[UICollectionView appearanceWhenContainedIn:[WPMediaCollectionViewController class],nil] setBackgroundColor:[UIColor colorWithRed:233/255.0f green:239/255.0f blue:243/255.0f alpha:1.0f]];
2120
return YES;
2221
}

Example/WPMediaPicker/WPMediaPicker-Info.plist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
<array>
2929
<string>armv7</string>
3030
</array>
31+
<key>UIStatusBarHidden</key>
32+
<false/>
3133
<key>UIStatusBarStyle</key>
3234
<string>UIStatusBarStyleLightContent</string>
35+
<key>UIViewControllerBasedStatusBarAppearance</key>
36+
<false/>
3337
<key>UISupportedInterfaceOrientations</key>
3438
<array>
3539
<string>UIInterfaceOrientationPortrait</string>

Pod/Classes/WPMediaCollectionViewController.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ - (void)viewDidLoad
6464
self.collectionView.bounces = YES;
6565
self.collectionView.alwaysBounceHorizontal = NO;
6666
self.collectionView.alwaysBounceVertical = YES;
67-
67+
// HACK: Fix for iOS 7 not respecting the appeareance background color
68+
if (![[self class] isiOS8OrAbove]) {
69+
UIColor * appearanceColor = [[UICollectionView appearanceWhenContainedIn:[WPMediaCollectionViewController class],nil] backgroundColor];
70+
if (!appearanceColor){
71+
appearanceColor = [[UICollectionView appearance] backgroundColor];
72+
}
73+
self.collectionView.backgroundColor = appearanceColor;
74+
}
6875
// Register cell classes
6976
[self.collectionView registerClass:[WPMediaCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([WPMediaCollectionViewCell class])];
7077
[self.collectionView registerClass:[WPMediaCaptureCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([WPMediaCaptureCollectionViewCell class])];

WPMediaPicker.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 = "WPMediaPicker"
3-
s.version = "0.3.3"
3+
s.version = "0.3.4"
44
s.summary = "WPMediaPicker is an iOS controller that allows capture and picking of media assets."
55
s.description = <<-DESC
66
WPMediaPicker is an iOS controller that allows capture and picking of media assets.

0 commit comments

Comments
 (0)