Skip to content

Commit 76f6a09

Browse files
galadrilgaladril
committed
Update to Xamarin Forms 4.5 with AndroidX (on the sample project)
1 parent f48eaed commit 76f6a09

File tree

7 files changed

+5829
-2482
lines changed

7 files changed

+5829
-2482
lines changed

‎Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples.Android/Properties/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xam.Plugin.SimpleBottomDrawer" android:installLocation="preferExternal">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
4-
<uses-permission android:name="android.permission.VIBRATE" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
4+
<uses-permission android:name="android.permission.VIBRATE" />
55
<application android:label="Xam.Plugin.SimpleBottomDrawer.Android" android:theme="@style/Theme.AppCompat.Light.NoActionBar"></application>
66
</manifest>

‎Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples.Android/Resources/Resource.designer.cs

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

‎Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples.Android/Xam.Plugin.SimpleBottomDrawer.Samples.Android.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1818
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
2222
</PropertyGroup>
@@ -59,11 +59,14 @@
5959
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
6060
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
6161
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
62+
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
63+
<Version>1.1.0</Version>
64+
</PackageReference>
6265
<PackageReference Include="Xamarin.Essentials">
63-
<Version>1.4.0</Version>
66+
<Version>1.5.0</Version>
6467
</PackageReference>
6568
<PackageReference Include="Xamarin.Forms">
66-
<Version>4.4.0.991757</Version>
69+
<Version>4.5.0.356</Version>
6770
</PackageReference>
6871
</ItemGroup>
6972
<ItemGroup>

‎Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples.iOS/Xam.Plugin.SimpleBottomDrawer.Samples.iOS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@
154154
</ItemGroup>
155155
<ItemGroup>
156156
<PackageReference Include="Xamarin.Essentials">
157-
<Version>1.4.0</Version>
157+
<Version>1.5.0</Version>
158158
</PackageReference>
159159
<PackageReference Include="Xamarin.Forms">
160-
<Version>4.4.0.991757</Version>
160+
<Version>4.5.0.356</Version>
161161
</PackageReference>
162162
</ItemGroup>
163163
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

‎Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples/Xam.Plugin.SimpleBottomDrawer.Samples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Xamarin.Essentials" Version="1.4.0" />
10-
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
9+
<PackageReference Include="Xamarin.Essentials" Version="1.5.0" />
10+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎Xam.Plugin.SimpleBottomDrawer/BottomDrawer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,9 @@ private double getProportionCoordinate(double proportion)
272272
/// </summary>
273273
public void Dismiss()
274274
{
275+
275276
var finalTranslation = Math.Max(Math.Min(0, -1000), -Math.Abs(getProportionCoordinate(LockStates[0])));
276-
this.TranslateTo(this.X, finalTranslation, 450, Easing.SpringOut);
277+
this.TranslateTo(this.X, finalTranslation, 450, Device.RuntimePlatform == Xamarin.Forms.Device.Android ? Easing.SpringOut : null);
277278
}
278279

279280
/// <summary>
@@ -282,7 +283,7 @@ public void Dismiss()
282283
public void Open()
283284
{
284285
var finalTranslation = Math.Max(Math.Min(0, -1000), -Math.Abs(getProportionCoordinate(LockStates[LockStates.Length - 1])));
285-
this.TranslateTo(this.X, finalTranslation, 150, Easing.SpringIn);
286+
this.TranslateTo(this.X, finalTranslation, 150, Device.RuntimePlatform == Xamarin.Forms.Device.Android ? Easing.SpringIn : null);
286287
}
287288

288289
#endregion Public

‎Xam.Plugin.SimpleBottomDrawer/Xam.Plugin.SimpleBottomDrawer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Xamarin.Essentials" Version="1.4.0" />
20-
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
19+
<PackageReference Include="Xamarin.Essentials" Version="1.5.0" />
20+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)