Skip to content

Commit 19c5a80

Browse files
committed
Merge branch 'master' of https://github.com/devSC/WSProgressHUD
2 parents b929ad9 + 6965aad commit 19c5a80

File tree

5 files changed

+44
-71
lines changed

5 files changed

+44
-71
lines changed

Demo/WSProgressHUD.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
buildSettings = {
445445
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
446446
INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist";
447-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
447+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
448448
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
449449
PRODUCT_NAME = "$(TARGET_NAME)";
450450
};
@@ -455,7 +455,7 @@
455455
buildSettings = {
456456
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
457457
INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist";
458-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
458+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
459459
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
460460
PRODUCT_NAME = "$(TARGET_NAME)";
461461
};

Demo/WSProgressHUD/WSProgressHUD.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ - (UILabel *)labelView
10911091
if (!_labelView) {
10921092
_labelView = [[UILabel alloc] initWithFrame:CGRectZero];
10931093
_labelView.textColor = [UIColor whiteColor];
1094-
1094+
_labelView.backgroundColor = [UIColor clearColor];
10951095
if ([UIFont respondsToSelector:@selector(preferredFontForTextStyle:)]) {
10961096
_labelView.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
10971097
} else {
@@ -1120,6 +1120,7 @@ - (FBShimmeringView *)shimmeringView
11201120
- (UILabel *)shimmeringLabel {
11211121
if (!_shimmeringLabel) {
11221122
_shimmeringLabel = [[UILabel alloc] initWithFrame:self.shimmeringView.bounds];
1123+
_shimmeringLabel.backgroundColor = [UIColor clearColor];
11231124
_shimmeringLabel.textColor = [UIColor whiteColor];
11241125
if ([UIFont respondsToSelector:@selector(preferredFontForTextStyle:)]) {
11251126
_shimmeringLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];

0 commit comments

Comments
 (0)