diff --git a/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs b/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
index 9d6b949..a6d06ff 100644
--- a/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
+++ b/Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
@@ -15,21 +15,41 @@ namespace Cirrious.FluentLayouts.Touch
{
public static class AdvancedFluentLayoutExtensions
{
- const float DefaultMargin = 0;
- const float DefaultScale = 1;
+ const float DefaultMargin = 0;
+ const float DefaultScale = 1;
public static FluentLayout AtTopOf(this UIView view, UIView parentView, nfloat? margin = null) =>
- view.Top().EqualTo().TopOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
+ view.Top().EqualTo().TopOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
+
+ public static FluentLayout AtTopOfWithSafeArea(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) =>
+ 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) =>
+ 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) =>
+ UIDevice.CurrentDevice.CheckSystemVersion(11, 0)
+ ? view.Bottom().EqualTo().BottomOf(parentView.SafeAreaLayoutGuide).Minus(margin.GetValueOrDefault(DefaultMargin))
+ : view.AtBottomOf(parentView, margin);
+
public static FluentLayout AtLeadingOf(this UIView view, UIView parentView, nfloat? margin = null) =>
view.Leading().EqualTo().LeadingOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
diff --git a/QuickLayout.Core/QuickLayout.Core.csproj b/QuickLayout.Core/QuickLayout.Core.csproj
index fa28c70..3de6c21 100644
--- a/QuickLayout.Core/QuickLayout.Core.csproj
+++ b/QuickLayout.Core/QuickLayout.Core.csproj
@@ -49,6 +49,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/QuickLayout.Touch/Views/FirstView.cs b/QuickLayout.Touch/Views/FirstView.cs
index aa6a2e4..c8ff226 100644
--- a/QuickLayout.Touch/Views/FirstView.cs
+++ b/QuickLayout.Touch/Views/FirstView.cs
@@ -11,7 +11,7 @@ namespace QuickLayout.Touch.Views
[Register("FirstView")]
public class FirstView : MvxViewController
{
- private UIButton _viewForm, _viewFormGrid, _viewDetails, _viewSearch, _viewTip, _viewUpdateConstaints, _viewAdvancedVerticalStack, _fullSize, _directionFormView, _rightToLeft;
+ private UIButton _viewForm, _viewFormGrid, _viewDetails, _viewSearch, _viewTip, _viewUpdateConstaints, _viewAdvancedVerticalStack, _fullSize, _directionFormView, _rightToLeft, _viewSafeArea;
public override void ViewDidLoad()
{
@@ -62,6 +62,10 @@ public override void ViewDidLoad()
_rightToLeft.SetTitle("Right-To-Left Support", UIControlState.Normal);
Add(_rightToLeft);
+ _viewSafeArea = new UIButton(UIButtonType.RoundedRect);
+ _viewSafeArea.SetTitle("View with Safe Area", UIControlState.Normal);
+ Add(_viewSafeArea);
+
View.SubviewsDoNotTranslateAutoresizingMaskIntoConstraints();
var set = this.CreateBindingSet();
@@ -75,6 +79,7 @@ public override void ViewDidLoad()
set.Bind(_fullSize).To("GoFullSize");
set.Bind(_directionFormView).To("GoDirectionForm");
set.Bind(_rightToLeft).To("GoRightToLeft");
+ set.Bind(_viewSafeArea).To("GoViewWithSafeArea");
set.Apply();
var constraints = View.VerticalStackPanelConstraints(
diff --git a/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs b/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs
new file mode 100644
index 0000000..0b558bb
--- /dev/null
+++ b/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs
@@ -0,0 +1,56 @@
+using System;
+using Cirrious.FluentLayouts.Touch;
+using Foundation;
+using MvvmCross.iOS.Views;
+using UIKit;
+
+namespace QuickLayout.Touch.Views
+{
+ [Register("ViewWithSafeAreaView")]
+ public class ViewWithSafeAreaView : MvxViewController
+ {
+ public override void ViewDidLoad()
+ {
+ base.ViewDidLoad();
+
+ View.BackgroundColor = UIColor.FromRGB(248, 191, 120);
+
+ var viewContainer = new UIView { BackgroundColor = UIColor.Clear };
+
+ var sampleText = new UITextView
+ {
+ Editable = false,
+ Selectable = false,
+ Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet massa eu tempus semper. Nulla elementum mi quis erat blandit eleifend. Quisque dictum, sem eget volutpat scelerisque, quam orci lobortis enim, ut luctus enim massa in nisi. Mauris sed mi id leo lacinia lobortis. Integer elementum, erat gravida vestibulum rhoncus, enim velit consectetur est, dignissim condimentum urna turpis ac ex. Nulla arcu mauris, hendrerit nec tortor in, feugiat ullamcorper mauris. Aliquam eget tempus eros. Curabitur suscipit, arcu eu luctus mollis, nunc erat ornare erat, id viverra nisl ligula sit amet ex. Etiam in quam vitae est convallis eleifend. Fusce gravida arcu in orci lobortis pulvinar. Morbi tortor mi, elementum nec purus quis, eleifend imperdiet mi. Nunc commodo et sem vitae finibus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc nec erat eget orci malesuada vulputate. \n \nPhasellus vulputate dolor eu massa varius efficitur. Sed sed tortor eu elit ornare mollis id non sapien. Nam at turpis volutpat ligula aliquam aliquet placerat sed purus. Phasellus magna urna, maximus vitae erat et, malesuada tincidunt velit. Mauris efficitur velit fermentum imperdiet convallis. In eget erat nisi. Curabitur ut leo sodales, consectetur lorem ut, iaculis est. Nullam ornare, justo id condimentum pharetra, enim nisl posuere ex, a fermentum justo enim sit amet dolor. Sed suscipit sapien augue, nec dignissim nisl laoreet eu. Maecenas eros enim, aliquet vitae arcu id, fermentum dignissim lorem. Etiam sit amet commodo nunc. In vitae ullamcorper velit. Integer in mauris eget erat mattis feugiat at id neque.",
+ TextColor = UIColor.Black,
+ BackgroundColor = UIColor.Clear
+ };
+ sampleText.TextContainer.LineBreakMode = UILineBreakMode.WordWrap;
+ sampleText.Font = UIFont.BoldSystemFontOfSize(18f);
+
+ View.AddSubview(viewContainer);
+ viewContainer.AddSubview(sampleText);
+
+ View.SubviewsDoNotTranslateAutoresizingMaskIntoConstraints();
+ viewContainer.SubviewsDoNotTranslateAutoresizingMaskIntoConstraints();
+
+ View.AddConstraints(
+ viewContainer.AtLeftOf(View),
+ viewContainer.AtTopOf(View),
+ viewContainer.AtRightOf(View),
+ viewContainer.AtBottomOf(View)
+ );
+
+ 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.AtLeftOf(viewContainer), -> if this is used, content overlaps under notch on landscape
+ sampleText.AtRightOfWithSafeArea(viewContainer),
+ //sampleText.AtRightOf(viewContainer), -> if this is used, content overlaps under notch on landscape
+ sampleText.AtBottomOfWithSafeArea(viewContainer)
+ //sampleText.AtBottomOf(viewContainer) -> if this is used, content overlaps under notch on landscape
+ );
+ }
+ }
+}