Skip to content

Adding nfloat throughout to prevent possible data loss. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2014
Merged

Adding nfloat throughout to prevent possible data loss. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,45 @@
//
// Project Lead - Stuart Lodge, @slodge, me@slodge.com

using System;
using System.Collections.Generic;
using UIKit;

namespace Cirrious.FluentLayouts.Touch
{
public static class AdvancedFluentLayoutExtensions
{
public static FluentLayout AtTopOf(this UIView view, UIView parentView, float margin = 0f)
const float DefaultMargin = 0;
const float DefaultScale = 1;

public static FluentLayout AtTopOf(this UIView view, UIView parentView, nfloat? margin = null)
{
return view.Top().EqualTo().TopOf(parentView).Plus(margin);
return view.Top().EqualTo().TopOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout AtLeftOf(this UIView view, UIView parentView, float margin = 0f)
public static FluentLayout AtLeftOf(this UIView view, UIView parentView, nfloat? margin = null)
{
return view.Left().EqualTo().LeftOf(parentView).Plus(margin);
return view.Left().EqualTo().LeftOf(parentView).Plus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout AtRightOf(this UIView view, UIView parentView, float margin = 0f)
public static FluentLayout AtRightOf(this UIView view, UIView parentView, nfloat? margin = null)
{
return view.Right().EqualTo().RightOf(parentView).Minus(margin);
return view.Right().EqualTo().RightOf(parentView).Minus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout AtBottomOf(this UIView view, UIView parentView, float margin = 0f)
public static FluentLayout AtBottomOf(this UIView view, UIView parentView, nfloat? margin = null)
{
return view.Bottom().EqualTo().BottomOf(parentView).Minus(margin);
return view.Bottom().EqualTo().BottomOf(parentView).Minus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout Below(this UIView view, UIView previous, float margin = 0f)
public static FluentLayout Below(this UIView view, UIView previous, nfloat? margin = null)
{
return view.Top().EqualTo().BottomOf(previous).Plus(margin);
return view.Top().EqualTo().BottomOf(previous).Plus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout Above(this UIView view, UIView previous, float margin = 0f)
public static FluentLayout Above(this UIView view, UIView previous, nfloat? margin = null)
{
return view.Bottom().EqualTo().TopOf(previous).Minus(margin);
return view.Bottom().EqualTo().TopOf(previous).Minus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout WithSameLeft(this UIView view, UIView previous)
Expand Down Expand Up @@ -77,41 +81,43 @@ public static FluentLayout WithSameBottom(this UIView view, UIView previous)
return view.Bottom().EqualTo().BottomOf(previous);
}

public static FluentLayout WithRelativeWidth(this UIView view, UIView previous, float scale = 1.0f)
public static FluentLayout WithRelativeWidth(this UIView view, UIView previous, nfloat? scale = null)
{
return view.Width().EqualTo().WidthOf(previous).WithMultiplier(scale);
return view.Width().EqualTo().WidthOf(previous).WithMultiplier(scale.GetValueOrDefault(DefaultScale));
}

public static FluentLayout WithSameHeight(this UIView view, UIView previous)
{
return view.Height().EqualTo().HeightOf(previous);
}

public static FluentLayout WithRelativeHeight(this UIView view, UIView previous, float scale = 1.0f)
public static FluentLayout WithRelativeHeight(this UIView view, UIView previous, nfloat? scale = null)
{
return view.Height().EqualTo().HeightOf(previous).WithMultiplier(scale);
return view.Height().EqualTo().HeightOf(previous).WithMultiplier(scale.GetValueOrDefault(DefaultScale));
}

public static FluentLayout ToRightOf(this UIView view, UIView previous, float margin = 0f)
public static FluentLayout ToRightOf(this UIView view, UIView previous, nfloat? margin = null)
{
return view.Left().EqualTo().RightOf(previous).Plus(margin);
return view.Left().EqualTo().RightOf(previous).Plus(margin.GetValueOrDefault(DefaultMargin));
}

public static FluentLayout ToLeftOf(this UIView view, UIView previous, float margin = 0f)
public static FluentLayout ToLeftOf(this UIView view, UIView previous, nfloat? margin = null)
{
return view.Right().EqualTo().LeftOf(previous).Minus(margin);
return view.Right().EqualTo().LeftOf(previous).Minus(margin.GetValueOrDefault(DefaultMargin));
}

public static IEnumerable<FluentLayout> FullWidthOf(this UIView view, UIView parent, float margin = 0f)
public static IEnumerable<FluentLayout> FullWidthOf(this UIView view, UIView parent, nfloat? margin = null)
{
yield return view.Left().EqualTo().LeftOf(parent).Plus(margin);
yield return view.Right().EqualTo().RightOf(parent).Minus(margin);
var marginValue = margin.GetValueOrDefault(DefaultMargin);
yield return view.Left().EqualTo().LeftOf(parent).Plus(marginValue);
yield return view.Right().EqualTo().RightOf(parent).Minus(marginValue);
}

public static IEnumerable<FluentLayout> FullHeightOf(this UIView view, UIView parent, float margin = 0f)
public static IEnumerable<FluentLayout> FullHeightOf(this UIView view, UIView parent, nfloat? margin = null)
{
yield return view.Top().EqualTo().TopOf(parent).Plus(margin);
yield return view.Bottom().EqualTo().BottomOf(parent).Minus(margin);
var marginValue = margin.GetValueOrDefault(DefaultMargin);
yield return view.Top().EqualTo().TopOf(parent).Plus(marginValue);
yield return view.Bottom().EqualTo().BottomOf(parent).Minus(marginValue);
}

public static IEnumerable<FluentLayout> VerticalStackPanelConstraints(this UIView parentView, Margins margins,
Expand Down
1 change: 1 addition & 0 deletions Cirrious.FluentLayout/Cirrious.FluentLayouts.Touch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RowSet-WorkInProgress\RowSet.cs" />
<Compile Include="UIViewAndLayoutAttribute.cs" />
<Compile Include="NfloatExtensions.cs" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions Cirrious.FluentLayout/FluentLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,23 @@ public FluentLayout(UIView view,
public NSLayoutRelation Relation { get; private set; }
public NSObject SecondItem { get; private set; }
public NSLayoutAttribute SecondAttribute { get; private set; }
public float Multiplier { get; private set; }
public float Constant { get; private set; }
public nfloat Multiplier { get; private set; }
public nfloat Constant { get; private set; }
public float Priority { get; private set; }

public FluentLayout Plus(float constant)
public FluentLayout Plus(nfloat constant)
{
Constant += constant;
return this;
}

public FluentLayout Minus(float constant)
public FluentLayout Minus(nfloat constant)
{
Constant -= constant;
return this;
}

public FluentLayout WithMultiplier(float multiplier)
public FluentLayout WithMultiplier(nfloat multiplier)
{
Multiplier = multiplier;
return this;
Expand Down
16 changes: 16 additions & 0 deletions Cirrious.FluentLayout/NfloatExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace System
{
internal static class NfloatExtensions
{
public static nfloat GetValueOrDefault(this nfloat? value)
{
return value.GetValueOrDefault(0);
}

public static nfloat GetValueOrDefault(this nfloat? value, nfloat defaultValue)
{
return null == value ? defaultValue : value.Value;
}
}
}