tweak safe area method names

Author: gshackles

Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs

@@ -21,31 +21,31 @@ public static class AdvancedFluentLayoutExtensions
         public static FluentLayout AtTopOf(this UIView view, UIView parentView, nfloat? margin = null) =>
             view.Top().EqualTo().TopOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
 
-        public static FluentLayout AtTopOfWithSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
+        public static FluentLayout AtTopOfSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
             UIDevice.CurrentDevice.CheckSystemVersion(11, 0)
                     ? view.Top().EqualTo().TopOf(parentView.SafeAreaLayoutGuide).Plus(margin.GetValueOrDefault(DefaultMargin))
                     : view.AtTopOf(parentView, margin);        
 
         public static FluentLayout AtLeftOf(this UIView view, UIView parentView, nfloat? margin = null) =>
 			view.Left().EqualTo().LeftOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
 
-        public static FluentLayout AtLeftOfWithSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
+        public static FluentLayout AtLeftOfSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
             UIDevice.CurrentDevice.CheckSystemVersion(11, 0)
                     ? view.Left().EqualTo().LeftOf(parentView.SafeAreaLayoutGuide).Plus(margin.GetValueOrDefault(DefaultMargin))
                     : view.AtLeftOf(parentView, margin);
 
         public static FluentLayout AtRightOf(this UIView view, UIView parentView, nfloat? margin = null) =>
 			view.Right().EqualTo().RightOf(parentView).Minus(margin.GetValueOrDefault(DefaultMargin));
 
-        public static FluentLayout AtRightOfWithSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
+        public static FluentLayout AtRightOfSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
             UIDevice.CurrentDevice.CheckSystemVersion(11, 0)
                     ? view.Right().EqualTo().RightOf(parentView.SafeAreaLayoutGuide).Minus(margin.GetValueOrDefault(DefaultMargin))
                     : view.AtRightOf(parentView, margin);
 
         public static FluentLayout AtBottomOf(this UIView view, UIView parentView, nfloat? margin = null) =>
 			view.Bottom().EqualTo().BottomOf(parentView).Minus(margin.GetValueOrDefault(DefaultMargin));
 
-        public static FluentLayout AtBottomOfWithSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
+        public static FluentLayout AtBottomOfSafeArea(this UIView view, UIView parentView, nfloat? margin = null) =>
             UIDevice.CurrentDevice.CheckSystemVersion(11, 0)
                     ? view.Bottom().EqualTo().BottomOf(parentView.SafeAreaLayoutGuide).Minus(margin.GetValueOrDefault(DefaultMargin))
                     : view.AtBottomOf(parentView, margin);

QuickLayout.Touch/Views/ViewWithSafeAreaView.cs

@@ -43,12 +43,12 @@ public override void ViewDidLoad()
 
             viewContainer.AddConstraints(
                 sampleText.AtTopOf(viewContainer),
-                // sampleText.AtTopOfWithSafeArea(viewContainer), -> use this when UINavigationBar not present to avoid content overlap under iPhone X notch
-                sampleText.AtLeftOfWithSafeArea(viewContainer),
+                // sampleText.AtTopOfSafeArea(viewContainer), -> use this when UINavigationBar not present to avoid content overlap under iPhone X notch
+                sampleText.AtLeftOfSafeArea(viewContainer),
                 //sampleText.AtLeftOf(viewContainer), -> if this is used, content overlaps under notch on landscape
-                sampleText.AtRightOfWithSafeArea(viewContainer),
+                sampleText.AtRightOfSafeArea(viewContainer),
                 //sampleText.AtRightOf(viewContainer), -> if this is used, content overlaps under notch on landscape
-                sampleText.AtBottomOfWithSafeArea(viewContainer)
+                sampleText.AtBottomOfSafeArea(viewContainer)
                 //sampleText.AtBottomOf(viewContainer) -> if this is used, content overlaps under notch on landscape
             );
         }