Skip to content

Commit affe164

Browse files
devedboxdevedbox
committed
Updated .
1 parent c9016e1 commit affe164

File tree

17 files changed

+451
-376
lines changed

17 files changed

+451
-376
lines changed

‎AXPopoverView.xcodeproj/project.pbxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@
146146
isa = PBXNativeTarget;
147147
buildConfigurationList = 01E7EAAB1BFB6DC3001176A2 /* Build configuration list for PBXNativeTarget "AXPopoverView" */;
148148
buildPhases = (
149-
5B1971D80B07ECAE07909361 /* 📦 Check Pods Manifest.lock */,
149+
5B1971D80B07ECAE07909361 /* [CP] Check Pods Manifest.lock */,
150150
01E7EA901BFB6DC3001176A2 /* Sources */,
151151
01E7EA911BFB6DC3001176A2 /* Frameworks */,
152152
01E7EA921BFB6DC3001176A2 /* Resources */,
153-
92FCA260DDD549238ADD6B74 /* 📦 Embed Pods Frameworks */,
154-
12E58A7F3B23B188D64169ED /* 📦 Copy Pods Resources */,
153+
92FCA260DDD549238ADD6B74 /* [CP] Embed Pods Frameworks */,
154+
12E58A7F3B23B188D64169ED /* [CP] Copy Pods Resources */,
155155
);
156156
buildRules = (
157157
);
@@ -211,44 +211,44 @@
211211
/* End PBXResourcesBuildPhase section */
212212

213213
/* Begin PBXShellScriptBuildPhase section */
214-
12E58A7F3B23B188D64169ED /* 📦 Copy Pods Resources */ = {
214+
12E58A7F3B23B188D64169ED /* [CP] Copy Pods Resources */ = {
215215
isa = PBXShellScriptBuildPhase;
216216
buildActionMask = 2147483647;
217217
files = (
218218
);
219219
inputPaths = (
220220
);
221-
name = "📦 Copy Pods Resources";
221+
name = "[CP] Copy Pods Resources";
222222
outputPaths = (
223223
);
224224
runOnlyForDeploymentPostprocessing = 0;
225225
shellPath = /bin/sh;
226226
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AXPopoverView/Pods-AXPopoverView-resources.sh\"\n";
227227
showEnvVarsInLog = 0;
228228
};
229-
5B1971D80B07ECAE07909361 /* 📦 Check Pods Manifest.lock */ = {
229+
5B1971D80B07ECAE07909361 /* [CP] Check Pods Manifest.lock */ = {
230230
isa = PBXShellScriptBuildPhase;
231231
buildActionMask = 2147483647;
232232
files = (
233233
);
234234
inputPaths = (
235235
);
236-
name = "📦 Check Pods Manifest.lock";
236+
name = "[CP] Check Pods Manifest.lock";
237237
outputPaths = (
238238
);
239239
runOnlyForDeploymentPostprocessing = 0;
240240
shellPath = /bin/sh;
241-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
241+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
242242
showEnvVarsInLog = 0;
243243
};
244-
92FCA260DDD549238ADD6B74 /* 📦 Embed Pods Frameworks */ = {
244+
92FCA260DDD549238ADD6B74 /* [CP] Embed Pods Frameworks */ = {
245245
isa = PBXShellScriptBuildPhase;
246246
buildActionMask = 2147483647;
247247
files = (
248248
);
249249
inputPaths = (
250250
);
251-
name = "📦 Embed Pods Frameworks";
251+
name = "[CP] Embed Pods Frameworks";
252252
outputPaths = (
253253
);
254254
runOnlyForDeploymentPostprocessing = 0;

‎AXPopoverView/AXPopoverView/AXPopoverView.m

+21-23
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
dispatch_async(dispatch_get_main_queue(), block);\
3434
}
3535
#endif
36+
#ifndef __IPHONE_ALLOWED_0
37+
#define __IPHONE_ALLOWED_0 __IPHONE_8_0
38+
#endif
3639
@interface AXPopoverView()
3740
{
3841
@protected
@@ -58,7 +61,7 @@ @interface AXPopoverView()
5861
@property(weak, nonatomic) UIPanGestureRecognizer *pan __deprecated;
5962
/// Scroll view.
6063
@property(weak, nonatomic) UIScrollView *scrollView;
61-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
64+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
6265
/// Blur effect view.
6366
@property(strong, nonatomic) UIVisualEffectView *effectView;
6467
#else
@@ -239,7 +242,7 @@ - (void)drawRect:(CGRect)rect {
239242
CAShapeLayer *maskLayer = [CAShapeLayer layer];
240243
maskLayer.path = _path;
241244

242-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
245+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
243246
_effectView.layer.mask = maskLayer;
244247
#else
245248
_effectBar.layer.mask = maskLayer;
@@ -337,7 +340,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
337340

338341
#pragma mark - Getters
339342

340-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
343+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
341344
- (UIVisualEffectView *)effectView {
342345
if (_effectView) return _effectView;
343346
_effectView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]];
@@ -375,13 +378,9 @@ - (UIView *)snapshotView {
375378
} else {
376379
view = [self.popoverWindow.appKeyWindow resizableSnapshotViewFromRect:self.frame afterScreenUpdates:YES withCapInsets:UIEdgeInsetsZero];
377380
}
378-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
379381
CAShapeLayer *layer = [CAShapeLayer layer];
380382
layer.path = _path;
381383
view.layer.mask = layer;
382-
#else
383-
view.layer.mask = layer;
384-
#endif
385384
return view;
386385
}
387386

@@ -557,24 +556,23 @@ - (void)setBackgroundColor:(UIColor *)backgroundColor {
557556
- (void)setTranslucent:(BOOL)translucent {
558557
_translucent = translucent;
559558

560-
AX_POPOVER_MAIN_THREAD(^(){
561-
if (translucent) {
562-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
563-
[self insertSubview:self.effectView atIndex:0];
564-
[_effectView.contentView addSubview:_contentView];
559+
if (translucent) {
560+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
561+
[self insertSubview:self.effectView atIndex:0];
562+
[_effectView.contentView addSubview:_contentView];
563+
// [self addSubview:_contentView];
565564
#else
566-
[self insertSubview:self.effectBar atIndex:0];
565+
[self insertSubview:self.effectBar atIndex:0];
567566
#endif
568-
} else {
569-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
570-
[self.effectView removeFromSuperview];
571-
[self addSubview:self.contentView];
567+
} else {
568+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
569+
[self.effectView removeFromSuperview];
570+
[self addSubview:self.contentView];
572571
#else
573-
[self.effectBar removeFromSuperview];
572+
[self.effectBar removeFromSuperview];
574573
#endif
575-
}
576-
[self setNeedsDisplay];
577-
});
574+
}
575+
[self setNeedsDisplay];
578576
}
579577

580578
- (void)setTranslucentStyle:(AXPopoverTranslucentStyle)translucentStyle {
@@ -583,14 +581,14 @@ - (void)setTranslucentStyle:(AXPopoverTranslucentStyle)translucentStyle {
583581
AX_POPOVER_MAIN_THREAD(^(){
584582
switch (_translucentStyle) {
585583
case AXPopoverTranslucentLight:
586-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
584+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
587585
_effectView.effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleExtraLight];
588586
#else
589587
_effectBar.barStyle = UIBarStyleDefault;
590588
#endif
591589
break;
592590
default:
593-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
591+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_ALLOWED_0
594592
_effectView.effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
595593
#else
596594
_effectBar.barStyle = UIBarStyleBlack;

‎AXPopoverView/TableViewController.m

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
4040
popoverView.preferredWidth = 200;
4141
[popoverView registerScrollView:tableView];
4242
popoverView.hideOnTouch = NO;
43+
popoverView.translucent = YES;
4344
switch (indexPath.row) {
4445
case 0:// 上边显示
4546
popoverView.preferredArrowDirection = AXPopoverArrowDirectionBottom;

‎AXPopoverView/ViewController.m

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ - (void)viewDidLoad {
3030
footerView.backgroundColor = [UIColor greenColor];
3131
_popoverView.headerView = headerView;
3232
_popoverView.footerView = footerView;
33+
34+
// UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
35+
// effectView.frame = self.view.bounds;
36+
// [self.view insertSubview:effectView atIndex:0];
37+
// UIImageView *imageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
38+
// imageView.image = [UIImage imageNamed:@"test"];
39+
// [effectView.contentView addSubview:imageView];
3340
}
3441

3542
- (void)didReceiveMemoryWarning {

‎Podfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PODS:
99
- pop (~> 1.0.4)
1010
- AGGeometryKit/CALayerProperties (1.2.4)
1111
- AGGeometryKit/UIViewProperties (1.2.4)
12-
- AXAttributedLabel (0.2.5)
12+
- AXAttributedLabel (0.2.9)
1313
- pop (1.0.9)
1414

1515
DEPENDENCIES:
@@ -19,9 +19,9 @@ DEPENDENCIES:
1919
SPEC CHECKSUMS:
2020
AGGeometryKit: 2c2c39c9f99eb7a966f0aa16b2a97027dacc4761
2121
AGGeometryKit+POP: 72c980191db0646c31bed0b1ffd571e05f9ad029
22-
AXAttributedLabel: 1fd8ee1faef2ff76e6c8af76f96f54b1fae02dcb
22+
AXAttributedLabel: 038ca8a876b3811a6e3e0471386a3592ccf68537
2323
pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
2424

2525
PODFILE CHECKSUM: 34e9dff85e41243faab89a2451625fb4dcc7dceb
2626

27-
COCOAPODS: 1.0.0.beta.8
27+
COCOAPODS: 1.1.0.beta.1

‎Pods/AXAttributedLabel/AXAttributedLabel/AXAttributedLabel/AXAttributedLabel.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)