Skip to content

Commit 980975a

Browse files
chrisriesgochrisriesgo
committed
Update version of Xamarin.Forms and fix the reflection issues
1 parent 36c40f0 commit 980975a

File tree

8 files changed

+5975
-65
lines changed

8 files changed

+5975
-65
lines changed

‎src/CustomLayouts/HomeView.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public HomeView()
1010
BackgroundColor = Color.White;
1111

1212
var label = new Label {
13-
XAlign = TextAlignment.Center,
13+
HorizontalTextAlignment = TextAlignment.Center,
1414
TextColor = Color.Black
1515
};
1616

‎src/CustomLayouts/SwitcherPage.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ public SwitcherPage()
1313
var none = new Button {
1414
HorizontalOptions = LayoutOptions.Center,
1515
Text = "No pager indicator",
16-
Command = new Command((obj) => Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.None)))
16+
Command = new Command(async (obj) => await Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.None)))
1717
};
1818
var dots = new Button {
1919
HorizontalOptions = LayoutOptions.Center,
2020
Text = "Dots",
21-
Command = new Command((obj) => Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.Dots)))
21+
Command = new Command(async (obj) => await Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.Dots)))
2222
};
2323
var tabs = new Button {
2424
HorizontalOptions = LayoutOptions.Center,
2525
Text = "Tabs",
26-
Command = new Command((obj) => Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.Tabs)))
26+
Command = new Command(async (obj) => await Navigation.PushAsync(new HomePage(CarouselLayout.IndicatorStyleEnum.Tabs)))
2727
};
2828
Content = new StackLayout {
2929
Orientation = StackOrientation.Vertical,

‎src/Droid/CustomLayouts.Droid.csproj‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidApplication>True</AndroidApplication>
1616
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1717
<AssemblyName>CustomLayouts.Droid</AssemblyName>
18-
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v6.0.99</TargetFrameworkVersion>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>
@@ -42,23 +42,44 @@
4242
<Reference Include="System.Xml" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Mono.Android" />
45-
<Reference Include="Xamarin.Forms.Platform.Android">
46-
<HintPath>..\packages\Xamarin.Forms.1.4.2.6359\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
45+
<Reference Include="Xamarin.Android.Support.v4">
46+
<HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
47+
</Reference>
48+
<Reference Include="Xamarin.Android.Support.v7.CardView">
49+
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
52+
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
55+
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
58+
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
61+
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Xamarin.Android.Support.Design">
64+
<HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
65+
</Reference>
66+
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
67+
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
4768
</Reference>
4869
<Reference Include="FormsViewGroup">
49-
<HintPath>..\packages\Xamarin.Forms.1.4.2.6359\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
70+
<HintPath>..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
5071
</Reference>
5172
<Reference Include="Xamarin.Forms.Core">
52-
<HintPath>..\packages\Xamarin.Forms.1.4.2.6359\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
73+
<HintPath>..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
5374
</Reference>
54-
<Reference Include="Xamarin.Forms.Xaml">
55-
<HintPath>..\packages\Xamarin.Forms.1.4.2.6359\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
75+
<Reference Include="Xamarin.Forms.Platform.Android">
76+
<HintPath>..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
5677
</Reference>
5778
<Reference Include="Xamarin.Forms.Platform">
58-
<HintPath>..\packages\Xamarin.Forms.1.4.2.6359\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
79+
<HintPath>..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
5980
</Reference>
60-
<Reference Include="Xamarin.Android.Support.v4">
61-
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
81+
<Reference Include="Xamarin.Forms.Xaml">
82+
<HintPath>..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
6283
</Reference>
6384
</ItemGroup>
6485
<ItemGroup>
@@ -86,6 +107,7 @@
86107
<AndroidResource Include="Resources\drawable\pin.png" />
87108
</ItemGroup>
88109
<Import Project="..\CustomLayouts\CustomLayouts.projitems" Label="Shared" Condition="Exists('..\CustomLayouts\CustomLayouts.projitems')" />
89-
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
90-
<Import Project="..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
110+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
111+
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
112+
<Import Project="..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
91113
</Project>

‎src/Droid/Renderers/CarouselLayoutRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override void OnElementChanged (VisualElementChangedEventArgs e)
3939
void ElementPropertyChanged(object sender, PropertyChangedEventArgs e) {
4040
if (e.PropertyName == "Renderer") {
4141
_scrollView = (HorizontalScrollView)typeof(ScrollViewRenderer)
42-
.GetField ("hScrollView", BindingFlags.NonPublic | BindingFlags.Instance)
42+
.GetField ("_hScrollView", BindingFlags.NonPublic | BindingFlags.Instance)
4343
.GetValue (this);
4444

4545
_scrollView.HorizontalScrollBarEnabled = false;

0 commit comments

Comments
 (0)