Skip to content

Commit 2c3106a

Browse files
committed
nuget updates
1 parent a8cfc0a commit 2c3106a

23 files changed

+2622
-27
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
using Xamarin.Forms;
5+
6+
namespace VisualChallenge.Design
7+
{
8+
public class ChallengeVisual : IVisual
9+
{
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="Xamarin.Forms" Version="3.5.0-visual-xaml0001" />
9+
</ItemGroup>
10+
11+
</Project>

VisualChallenge/VisualChallenge.Android/MainActivity.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ protected override void OnCreate(Bundle savedInstanceState)
2121

2222
base.OnCreate(savedInstanceState);
2323

24-
global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental", "Visual_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental");
24+
global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental");
2525
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
26-
LoadApplication(new App());
26+
global::Xamarin.Forms.FormsMaterial.Init(this, savedInstanceState);
27+
LoadApplication(new App());
2728
}
2829
}
2930
}

VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs

Lines changed: 2582 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<Reference Include="System.Xml" />
4949
</ItemGroup>
5050
<ItemGroup>
51-
<PackageReference Include="Xamarin.Forms" Version="4.0.1.170976" />
51+
<PackageReference Include="Xamarin.Forms" Version="4.0.1.206893" />
5252
<PackageReference Include="Xamarin.Forms.Visual.Material">
53-
<Version>4.0.1.170976</Version>
53+
<Version>4.0.1.206893</Version>
5454
</PackageReference>
5555
</ItemGroup>
5656
<ItemGroup>

VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
<Reference Include="Xamarin.iOS" />
133133
</ItemGroup>
134134
<ItemGroup>
135-
<PackageReference Include="Xamarin.Forms" Version="4.0.1.170976" />
135+
<PackageReference Include="Xamarin.Forms" Version="4.0.1.206893" />
136136
<PackageReference Include="Xamarin.Forms.Visual.Material">
137-
<Version>3.6.0.135200-pre1</Version>
137+
<Version>4.0.1.206893</Version>
138138
</PackageReference>
139139
</ItemGroup>
140140
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

VisualChallenge/VisualChallenge/VisualChallenge.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Xamarin.Forms" Version="4.0.1.170976" />
15-
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.1.170976" />
14+
<PackageReference Include="Xamarin.Forms" Version="4.0.1.206893" />
15+
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.1.206893" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

VisualChallenge/VisualChallenge/VisualChallengePage.xaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
Title="Visual Challenge"
99
>
1010

11-
<FlexLayout Margin="20" Direction="Column" AlignContent="Center" JustifyContent="SpaceAround">
11+
<!-- If you decide to change out the flexlayout leave the scroll view here
12+
Currently there's a bug in shell that will set margins wrong if the content is not in a scrollview
13+
-->
14+
<ScrollView>
15+
<FlexLayout Margin="20" Direction="Column" AlignContent="Center" JustifyContent="SpaceAround">
1216

13-
<Label Text="Start Here" FontSize="24" HorizontalTextAlignment="Center"/>
17+
<Label Text="Start Here" FontSize="24" HorizontalTextAlignment="Center"/>
1418

15-
<Button Text="Read More About Visual" Clicked="Button_Clicked" />
19+
<Button Text="Read More About Visual" Clicked="Button_Clicked" />
1620

17-
</FlexLayout>
18-
21+
</FlexLayout>
22+
</ScrollView>
1923
</ContentPage>
-12.1 MB
Binary file not shown.
12.1 MB
Binary file not shown.

0 commit comments

Comments
 (0)