|
@@ -737,6 +737,11 @@ PKPushRegistry *pushRegistry;
|
|
|
{
|
|
|
UITabBarItem *item;
|
|
|
NSLayoutConstraint *constraint;
|
|
|
+ CGFloat safeAreaBottom = 0;
|
|
|
+
|
|
|
+ if (@available(iOS 11, *)) {
|
|
|
+ safeAreaBottom = [UIApplication sharedApplication].delegate.window.safeAreaInsets.bottom;
|
|
|
+ }
|
|
|
|
|
|
// File
|
|
|
item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFile];
|
|
@@ -779,21 +784,36 @@ PKPushRegistry *pushRegistry;
|
|
|
[buttonPlus setTranslatesAutoresizingMaskIntoConstraints:NO];
|
|
|
[tabBarController.tabBar addSubview:buttonPlus];
|
|
|
|
|
|
- // X
|
|
|
- constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0];
|
|
|
- [tabBarController.view addConstraint:constraint];
|
|
|
-
|
|
|
- // Y
|
|
|
- constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeTop multiplier:1.0 constant:5];
|
|
|
- [tabBarController.view addConstraint:constraint];
|
|
|
-
|
|
|
- // Width
|
|
|
- constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:40];
|
|
|
- [tabBarController.view addConstraint:constraint];
|
|
|
-
|
|
|
- // Height
|
|
|
- constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:40];
|
|
|
- [tabBarController.view addConstraint:constraint];
|
|
|
+ if (safeAreaBottom > 0) {
|
|
|
+
|
|
|
+ // X
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Y
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeTop multiplier:1.0 constant:5];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Width
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:40];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Height
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:40];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+
|
|
|
+ } else {
|
|
|
+
|
|
|
+ // X
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Y
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterY multiplier:1.0 constant:0];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Width
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:33];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ // Height
|
|
|
+ constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:33];
|
|
|
+ [tabBarController.view addConstraint:constraint];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- (void)plusButtonVisibile:(BOOL)visible
|