[ios] naming conventionsupstream/fred/layout-anchors

3 files changed, 19 insertions, 23 deletions

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index c2d3b7cd06..2b7de3696d 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -569,7 +569,17 @@ public:
         [MGLMapboxEvents pushEvent:MMEEventTypeMapLoad withAttributes:@{}];
     }
     
-    [self setupConstraints];
+    [[self.scaleBar.topAnchor constraintEqualToAnchor:self.mgl_safeTopAnchor constant:8] setActive:YES];
+    [[self.scaleBar.leadingAnchor constraintEqualToAnchor:self.mgl_safeLeadingAnchor constant:8] setActive:YES];
+    
+    [[self.compassView.topAnchor constraintEqualToAnchor:self.mgl_safeTopAnchor constant:8] setActive:YES];
+    [[self.compassView.trailingAnchor constraintEqualToAnchor:self.mgl_safeTrailingAnchor constant:-8] setActive:YES];
+    
+    [[self.attributionButton.bottomAnchor constraintEqualToAnchor:self.mgl_safeBottomAnchor constant:-8] setActive:YES];
+    [[self.attributionButton.trailingAnchor constraintEqualToAnchor:self.mgl_safeTrailingAnchor constant:-8] setActive:YES];
+    
+    [[self.logoView.leadingAnchor constraintEqualToAnchor:self.mgl_safeLeadingAnchor constant:8] setActive:YES];
+    [[self.logoView.bottomAnchor constraintEqualToAnchor:self.mgl_safeBottomAnchor constant:-8] setActive:YES];
 }
 
 - (mbgl::Size)size
@@ -723,20 +733,6 @@ public:
     return nil;
 }
 
-- (void)setupConstraints {
-    [[self.scaleBar.topAnchor constraintEqualToAnchor:self.safeTopAnchor constant:8] setActive:YES];
-    [[self.scaleBar.leadingAnchor constraintEqualToAnchor:self.safeLeadingAnchor constant:8] setActive:YES];
-    
-    [[self.compassView.topAnchor constraintEqualToAnchor:self.safeTopAnchor constant:8] setActive:YES];
-    [[self.compassView.trailingAnchor constraintEqualToAnchor:self.safeTrailingAnchor constant:-8] setActive:YES];
-    
-    [[self.attributionButton.bottomAnchor constraintEqualToAnchor:self.safeBottomAnchor constant:-8] setActive:YES];
-    [[self.attributionButton.trailingAnchor constraintEqualToAnchor:self.safeTrailingAnchor constant:-8] setActive:YES];
-    
-    [[self.logoView.leadingAnchor constraintEqualToAnchor:self.safeLeadingAnchor constant:8] setActive:YES];
-    [[self.logoView.bottomAnchor constraintEqualToAnchor:self.safeBottomAnchor constant:-8] setActive:YES];
-}
-
 - (BOOL)isOpaque
 {
     return _opaque;
diff --git a/platform/ios/src/UIView+MGLAdditions.h b/platform/ios/src/UIView+MGLAdditions.h
index f3d0674fd7..4e9fe2e961 100644
--- a/platform/ios/src/UIView+MGLAdditions.h
+++ b/platform/ios/src/UIView+MGLAdditions.h
@@ -4,13 +4,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UIView (MGLAdditions)
 
-- (NSLayoutYAxisAnchor *)safeTopAnchor;
+- (NSLayoutYAxisAnchor *)mgl_safeTopAnchor;
 
-- (NSLayoutXAxisAnchor *)safeLeadingAnchor;
+- (NSLayoutXAxisAnchor *)mgl_safeLeadingAnchor;
 
-- (NSLayoutYAxisAnchor *)safeBottomAnchor;
+- (NSLayoutYAxisAnchor *)mgl_safeBottomAnchor;
 
-- (NSLayoutXAxisAnchor *)safeTrailingAnchor;
+- (NSLayoutXAxisAnchor *)mgl_safeTrailingAnchor;
 
 @end
 
diff --git a/platform/ios/src/UIView+MGLAdditions.m b/platform/ios/src/UIView+MGLAdditions.m
index 041ce0ce89..cac54b6fd4 100644
--- a/platform/ios/src/UIView+MGLAdditions.m
+++ b/platform/ios/src/UIView+MGLAdditions.m
@@ -2,7 +2,7 @@
 
 @implementation UIView (MGLAdditions)
 
-- (NSLayoutYAxisAnchor *)safeTopAnchor {
+- (NSLayoutYAxisAnchor *)mgl_safeTopAnchor {
     if (@available(iOS 11.0, *)) {
         return self.safeAreaLayoutGuide.topAnchor;
     } else {
@@ -10,7 +10,7 @@
     }
 }
 
-- (NSLayoutXAxisAnchor *)safeLeadingAnchor {
+- (NSLayoutXAxisAnchor *)mgl_safeLeadingAnchor {
     if (@available(iOS 11.0, *)) {
         return self.safeAreaLayoutGuide.leadingAnchor;
     } else {
@@ -18,7 +18,7 @@
     }
 }
 
-- (NSLayoutYAxisAnchor *)safeBottomAnchor {
+- (NSLayoutYAxisAnchor *)mgl_safeBottomAnchor {
     if (@available(iOS 11.0, *)) {
         return self.safeAreaLayoutGuide.bottomAnchor;
     } else {
@@ -26,7 +26,7 @@
     }
 }
 
-- (NSLayoutXAxisAnchor *)safeTrailingAnchor {
+- (NSLayoutXAxisAnchor *)mgl_safeTrailingAnchor {
     if (@available(iOS 11.0, *)) {
         return self.safeAreaLayoutGuide.trailingAnchor;
     } else {