Skip to content

Commit fa05b3b

Browse files
NathanCastleNathanCastle
committed
Added improved grid samples to layout sample
1 parent a9220ab commit fa05b3b

File tree

10 files changed

+225
-41
lines changed

10 files changed

+225
-41
lines changed

‎UserInterface/Layout/Droid/LayoutSamples.Droid.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@
4646
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Xamarin.Forms.Platform.Android">
49-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
49+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
5050
</Reference>
5151
<Reference Include="FormsViewGroup">
52-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
52+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Xamarin.Forms.Core">
55-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
55+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Xamarin.Forms.Xaml">
58-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
58+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Xamarin.Forms.Platform">
61-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
61+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
6262
</Reference>
6363
</ItemGroup>
6464
<ItemGroup>
@@ -89,5 +89,5 @@
8989
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
9090
</ItemGroup>
9191
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
92-
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
92+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
9393
</Project>

‎UserInterface/Layout/Droid/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="MonoAndroid50" />
4-
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="MonoAndroid50" />
4+
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="MonoAndroid50" />
55
</packages>

‎UserInterface/Layout/LayoutSamples/CalculatorGridCode.cs‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
using System;
2+
3+
using Xamarin.Forms;
4+
5+
namespace LayoutSamples
6+
{
7+
public class CalculatorGridCode : ContentPage
8+
{
9+
public CalculatorGridCode ()
10+
{
11+
Title = "Calculator - C#";
12+
BackgroundColor = Color.FromHex ("#404040");
13+
14+
var plainButton = new Style (typeof(Button)) {
15+
Setters = {
16+
new Setter { Property = Button.BackgroundColorProperty, Value = Color.FromHex ("#eee") },
17+
new Setter { Property = Button.TextColorProperty, Value = Color.Black },
18+
new Setter { Property = Button.BorderRadiusProperty, Value = 0 },
19+
new Setter { Property = Button.FontSizeProperty, Value = 40 }
20+
}
21+
};
22+
var darkerButton = new Style (typeof(Button)) {
23+
Setters = {
24+
new Setter { Property = Button.BackgroundColorProperty, Value = Color.FromHex ("#ddd") },
25+
new Setter { Property = Button.TextColorProperty, Value = Color.Black },
26+
new Setter { Property = Button.BorderRadiusProperty, Value = 0 },
27+
new Setter { Property = Button.FontSizeProperty, Value = 40 }
28+
}
29+
};
30+
var orangeButton = new Style (typeof(Button)) {
31+
Setters = {
32+
new Setter { Property = Button.BackgroundColorProperty, Value = Color.FromHex ("#E8AD00") },
33+
new Setter { Property = Button.TextColorProperty, Value = Color.White },
34+
new Setter { Property = Button.BorderRadiusProperty, Value = 0 },
35+
new Setter { Property = Button.FontSizeProperty, Value = 40 }
36+
}
37+
};
38+
39+
var controlGrid = new Grid { RowSpacing = 1, ColumnSpacing = 1 };
40+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (150) });
41+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (1, GridUnitType.Star) });
42+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (1, GridUnitType.Star) });
43+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (1, GridUnitType.Star) });
44+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (1, GridUnitType.Star) });
45+
controlGrid.RowDefinitions.Add (new RowDefinition { Height = new GridLength (1, GridUnitType.Star) });
46+
47+
controlGrid.ColumnDefinitions.Add (new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) });
48+
controlGrid.ColumnDefinitions.Add (new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) });
49+
controlGrid.ColumnDefinitions.Add (new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) });
50+
controlGrid.ColumnDefinitions.Add (new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) });
51+
52+
var label = new Label {
53+
Text = "0",
54+
XAlign = TextAlignment.End,
55+
YAlign = TextAlignment.End,
56+
TextColor = Color.White,
57+
FontSize = 60
58+
};
59+
controlGrid.Children.Add (label, 0, 0);
60+
61+
Grid.SetColumnSpan (label, 4);
62+
63+
controlGrid.Children.Add (new Button { Text = "C", Style = darkerButton }, 0, 1);
64+
controlGrid.Children.Add (new Button { Text = "+/-", Style = darkerButton }, 1, 1);
65+
controlGrid.Children.Add (new Button { Text = "%", Style = darkerButton }, 2, 1);
66+
controlGrid.Children.Add (new Button { Text = "div", Style = orangeButton }, 3, 1);
67+
controlGrid.Children.Add (new Button { Text = "7", Style = plainButton }, 0, 2);
68+
controlGrid.Children.Add (new Button { Text = "8", Style = plainButton }, 1, 2);
69+
controlGrid.Children.Add (new Button { Text = "9", Style = plainButton }, 2, 2);
70+
controlGrid.Children.Add (new Button { Text = "X", Style = orangeButton }, 3, 2);
71+
controlGrid.Children.Add (new Button { Text = "4", Style = plainButton }, 0, 3);
72+
controlGrid.Children.Add (new Button { Text = "5", Style = plainButton }, 1, 3);
73+
controlGrid.Children.Add (new Button { Text = "6", Style = plainButton }, 2, 3);
74+
controlGrid.Children.Add (new Button { Text = "-", Style = orangeButton }, 3, 3);
75+
controlGrid.Children.Add (new Button { Text = "1", Style = plainButton }, 0, 4);
76+
controlGrid.Children.Add (new Button { Text = "2", Style = plainButton }, 1, 4);
77+
controlGrid.Children.Add (new Button { Text = "3", Style = plainButton }, 2, 4);
78+
controlGrid.Children.Add (new Button { Text = "+", Style = orangeButton }, 3, 4);
79+
controlGrid.Children.Add (new Button { Text = ".", Style = plainButton }, 2, 5);
80+
controlGrid.Children.Add (new Button { Text = "=", Style = orangeButton }, 3, 5);
81+
82+
var zeroButton = new Button { Text = "0", Style = plainButton };
83+
controlGrid.Children.Add (zeroButton, 0, 5);
84+
Grid.SetColumnSpan (zeroButton, 2);
85+
86+
Content = controlGrid;
87+
}
88+
}
89+
}
90+
91+

‎UserInterface/Layout/LayoutSamples/CalculatorGridXAML.xaml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
x:Class="LayoutSamples.CalculatorGridXAML"
5+
Title = "Calculator - XAML"
6+
BackgroundColor="#404040">
7+
<ContentPage.Resources>
8+
<ResourceDictionary>
9+
<Style x:Key="plainButton" TargetType="Button">
10+
<Setter Property="BackgroundColor" Value="#eee"/>
11+
<Setter Property="TextColor" Value="Black" />
12+
<Setter Property="BorderRadius" Value="0"/>
13+
<Setter Property="FontSize" Value="40" />
14+
</Style>
15+
<Style x:Key="darkerButton" TargetType="Button">
16+
<Setter Property="BackgroundColor" Value="#ddd"/>
17+
<Setter Property="TextColor" Value="Black" />
18+
<Setter Property="BorderRadius" Value="0"/>
19+
<Setter Property="FontSize" Value="40" />
20+
</Style>
21+
<Style x:Key="orangeButton" TargetType="Button">
22+
<Setter Property="BackgroundColor" Value="#E8AD00"/>
23+
<Setter Property="TextColor" Value="White" />
24+
<Setter Property="BorderRadius" Value="0"/>
25+
<Setter Property="FontSize" Value="40" />
26+
</Style>
27+
</ResourceDictionary>
28+
</ContentPage.Resources>
29+
<ContentPage.Content>
30+
<Grid x:Name="controlGrid" RowSpacing="1" ColumnSpacing="1">
31+
<Grid.RowDefinitions>
32+
<RowDefinition Height="150" />
33+
<RowDefinition Height="*" />
34+
<RowDefinition Height="*" />
35+
<RowDefinition Height="*" />
36+
<RowDefinition Height="*" />
37+
<RowDefinition Height="*" />
38+
</Grid.RowDefinitions>
39+
<Grid.ColumnDefinitions>
40+
<ColumnDefinition Width="*" />
41+
<ColumnDefinition Width="*" />
42+
<ColumnDefinition Width="*" />
43+
<ColumnDefinition Width="*" />
44+
</Grid.ColumnDefinitions>
45+
<Label Text="0" Grid.Row="0" XAlign="End" YAlign="End" TextColor="White" FontSize="60" Grid.ColumnSpan="4" />
46+
<Button Text = "C" Grid.Row="1" Grid.Column="0" Style="{StaticResource darkerButton}" />
47+
<Button Text = "+/-" Grid.Row="1" Grid.Column="1" Style="{StaticResource darkerButton}" />
48+
<Button Text = "%" Grid.Row="1" Grid.Column="2" Style="{StaticResource darkerButton}" />
49+
<Button Text = "div" Grid.Row="1" Grid.Column="3" Style="{StaticResource orangeButton}" />
50+
<Button Text = "7" Grid.Row="2" Grid.Column="0" Style="{StaticResource plainButton}" />
51+
<Button Text = "8" Grid.Row="2" Grid.Column="1" Style="{StaticResource plainButton}" />
52+
<Button Text = "9" Grid.Row="2" Grid.Column="2" Style="{StaticResource plainButton}" />
53+
<Button Text = "X" Grid.Row="2" Grid.Column="3" Style="{StaticResource orangeButton}" />
54+
<Button Text = "4" Grid.Row="3" Grid.Column="0" Style="{StaticResource plainButton}" />
55+
<Button Text = "5" Grid.Row="3" Grid.Column="1" Style="{StaticResource plainButton}" />
56+
<Button Text = "6" Grid.Row="3" Grid.Column="2" Style="{StaticResource plainButton}" />
57+
<Button Text = "-" Grid.Row="3" Grid.Column="3" Style="{StaticResource orangeButton}" />
58+
<Button Text = "1" Grid.Row="4" Grid.Column="0" Style="{StaticResource plainButton}" />
59+
<Button Text = "2" Grid.Row="4" Grid.Column="1" Style="{StaticResource plainButton}" />
60+
<Button Text = "3" Grid.Row="4" Grid.Column="2" Style="{StaticResource plainButton}" />
61+
<Button Text = "+" Grid.Row="4" Grid.Column="3" Style="{StaticResource orangeButton}" />
62+
<Button Text = "0" Grid.ColumnSpan="2" Grid.Row="5" Grid.Column="0" Style="{StaticResource plainButton}" />
63+
<Button Text = "." Grid.Row="5" Grid.Column="2" Style="{StaticResource plainButton}" />
64+
<Button Text = "=" Grid.Row="5" Grid.Column="3" Style="{StaticResource orangeButton}" />
65+
</Grid>
66+
</ContentPage.Content>
67+
</ContentPage>

‎UserInterface/Layout/LayoutSamples/CalculatorGridXAML.xaml.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
using Xamarin.Forms;
5+
6+
namespace LayoutSamples
7+
{
8+
public partial class CalculatorGridXAML : ContentPage
9+
{
10+
public CalculatorGridXAML ()
11+
{
12+
InitializeComponent ();
13+
}
14+
}
15+
}
16+

‎UserInterface/Layout/LayoutSamples/LayoutSamples.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,13 @@
7676
<DependentUpon>ScrollingDemoXAML.xaml</DependentUpon>
7777
</Compile>
7878
<Compile Include="ScrollingDemoCode.cs" />
79+
<Compile Include="CalculatorGridXAML.xaml.cs">
80+
<DependentUpon>CalculatorGridXAML.xaml</DependentUpon>
81+
</Compile>
82+
<Compile Include="CalculatorGridCode.cs" />
7983
</ItemGroup>
8084
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
81-
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
85+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
8286
<ItemGroup>
8387
<EmbeddedResource Include="MonkeyMoneyXaml.xaml">
8488
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -113,16 +117,19 @@
113117
<EmbeddedResource Include="ScrollingDemoXAML.xaml">
114118
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
115119
</EmbeddedResource>
120+
<EmbeddedResource Include="CalculatorGridXAML.xaml">
121+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
122+
</EmbeddedResource>
116123
</ItemGroup>
117124
<ItemGroup>
118125
<Reference Include="Xamarin.Forms.Core">
119-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
126+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
120127
</Reference>
121128
<Reference Include="Xamarin.Forms.Xaml">
122-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
129+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
123130
</Reference>
124131
<Reference Include="Xamarin.Forms.Platform">
125-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
132+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
126133
</Reference>
127134
</ItemGroup>
128135
<ItemGroup>

‎UserInterface/Layout/LayoutSamples/ListPage.xaml.cs‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,29 @@ public partial class ListPage : ContentPage
1010
public ListPage ()
1111
{
1212
InitializeComponent ();
13-
List<Page> listOfPages = new List<Page> ();
14-
listOfPages.Add(new MonkeyMoneyXaml ());
15-
listOfPages.Add (new MonkeyMoneyCode ());
16-
listOfPages.Add (new MonkeyMusic ());
17-
listOfPages.Add (new MonkeyMusicCode ());
18-
listOfPages.Add (new AbsoluteLayoutDemoXaml ());
19-
listOfPages.Add (new AbsoluteLayoutDemoCode ());
20-
listOfPages.Add (new RelativeLayoutDemo ());
21-
listOfPages.Add (new RelativeLayoutDemoCode ());
22-
listOfPages.Add (new RelativeLayoutExploration ());
23-
listOfPages.Add (new RelativeLayoutExplorationCode ());
24-
listOfPages.Add (new AbsoluteLayoutExplorationCode ());
25-
listOfPages.Add (new AbsoluteLayoutExploration ());
26-
listOfPages.Add (new GridExploration ());
27-
listOfPages.Add (new StackLayoutDemo ());
28-
listOfPages.Add (new StackLayoutDemoCode ());
29-
listOfPages.Add (new LabelGridXaml ());
30-
listOfPages.Add (new LabelGridCode ());
31-
listOfPages.Add (new ScrollingDemoXAML ());
32-
listOfPages.Add (new ScrollingDemoCode ());
13+
List<Page> listOfPages = new List<Page> () {
14+
new CalculatorGridXAML (),
15+
new CalculatorGridCode (),
16+
new MonkeyMoneyXaml (),
17+
new MonkeyMoneyCode (),
18+
new MonkeyMusic (),
19+
new MonkeyMusicCode (),
20+
new AbsoluteLayoutDemoXaml (),
21+
new AbsoluteLayoutDemoCode (),
22+
new RelativeLayoutDemo (),
23+
new RelativeLayoutDemoCode (),
24+
new RelativeLayoutExploration (),
25+
new RelativeLayoutExplorationCode (),
26+
new AbsoluteLayoutExploration (),
27+
new AbsoluteLayoutExplorationCode (),
28+
new GridExploration (),
29+
new StackLayoutDemo (),
30+
new StackLayoutDemoCode (),
31+
new LabelGridXaml (),
32+
new LabelGridCode (),
33+
new ScrollingDemoXAML (),
34+
new ScrollingDemoCode ()
35+
};
3336

3437
listPages.ItemsSource = listOfPages;
3538
listPages.ItemSelected += ListPages_ItemSelected;

‎UserInterface/Layout/LayoutSamples/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
44
</packages>

‎UserInterface/Layout/iOS/LayoutSamples.iOS.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@
6565
<Reference Include="System.Xml" />
6666
<Reference Include="System.Core" />
6767
<Reference Include="Xamarin.iOS" />
68+
<Reference Include="Calabash">
69+
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.16.2\lib\Xamarin.iOS10\Calabash.dll</HintPath>
70+
</Reference>
6871
<Reference Include="Xamarin.Forms.Platform.iOS">
69-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
72+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
7073
</Reference>
7174
<Reference Include="Xamarin.Forms.Core">
72-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
75+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
7376
</Reference>
7477
<Reference Include="Xamarin.Forms.Xaml">
75-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
78+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
7679
</Reference>
7780
<Reference Include="Xamarin.Forms.Platform">
78-
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Calabash">
81-
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.16.2\lib\Xamarin.iOS10\Calabash.dll</HintPath>
81+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6447\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
8282
</Reference>
8383
</ItemGroup>
8484
<ItemGroup>
@@ -121,5 +121,5 @@
121121
<ITunesArtwork Include="ITunesArtwork%402x" />
122122
</ItemGroup>
123123
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
124-
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
124+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
125125
</Project>

‎UserInterface/Layout/iOS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="xamarinios10" />
44
<package id="Xamarin.TestCloud.Agent" version="0.16.2" targetFramework="xamarinios10" />
55
</packages>

0 commit comments

Comments
 (0)