Skip to content

adds XF 5.x support #2

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

Open
gsgou wants to merge 4 commits into
base: master
Choose a base branch
from
Open

adds XF 5.x support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c33cda
update lib and sample nugets
gsgou Nov 6, 2022
759c6f2
[android] update target framework to v13.0
gsgou Nov 6, 2022
8087c33
replace ContentPresenter with ContentView
gsgou Nov 6, 2022
fcaf7af
remove default Fill value
gsgou Nov 6, 2022
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
14 changes: 3 additions & 11 deletions ...ndAfter/BeforeAndAfter/BeforeAndAfter.Sample.Android/BeforeAndAfter.Sample.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -53,15 +52,8 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
2 changes: 1 addition & 1 deletion ...eforeAndAfter/BeforeAndAfter/BeforeAndAfter.Sample.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="de.marius.BeforeAndAfter.Sample" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
<application android:label="BeforeAndAfter.Sample.Android" android:icon="@mipmap/icon"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
4 changes: 2 additions & 2 deletions .../BeforeAndAfter/BeforeAndAfter/BeforeAndAfter.Sample.iOS/BeforeAndAfter.Sample.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Sample/BeforeAndAfter/BeforeAndAfter/BeforeAndAfter.Sample/BeforeAndAfter.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions Sample/BeforeAndAfter/BeforeAndAfter/BeforeAndAfter.Sample/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@
<!-- here's the OPTIONAL thumb control. You drag on this one to show/hide the previous two views -->
<beforeAndAfter:BeforeAfter.ThumbControl>
<Grid Margin="0" Padding="0">
<BoxView VerticalOptions="Fill"
HorizontalOptions="Center"
<BoxView HorizontalOptions="Center"
WidthRequest="5"
Color="#88FFFFFF" />
<BoxView WidthRequest="36"
Expand Down
6 changes: 3 additions & 3 deletions lib/BeforeAndAfter/BeforeAfter.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
<Grid x:Name="LayoutRoot">

<!-- BeforeView -->
<ContentPresenter Content="{Binding Source={x:Reference ME}, Path=BeforeView}" />
<ContentView Content="{Binding Source={x:Reference ME}, Path=BeforeView}" />

<Grid x:Name="AfterViewParentLayout"
IsClippedToBounds="True"
TranslationX="{DynamicResource Offset}">

<!-- AfterView -->
<ContentPresenter Content="{Binding Source={x:Reference ME}, Path=AfterView}"
<ContentView Content="{Binding Source={x:Reference ME}, Path=AfterView}"
TranslationX="{DynamicResource NegativeOffset}" />
</Grid>

Expand All @@ -40,7 +40,7 @@
<PanGestureRecognizer PanUpdated="PanGestureRecognizer_OnPanUpdated" />
</Grid.GestureRecognizers>

<ContentPresenter Content="{Binding Source={x:Reference ME}, Path=ThumbControl}" />
<ContentView Content="{Binding Source={x:Reference ME}, Path=ThumbControl}" />
</Grid>
</Grid>
</ContentView>
4 changes: 2 additions & 2 deletions lib/BeforeAndAfter/BeforeAndAfter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand Down Expand Up @@ -29,7 +29,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
</ItemGroup>

<ItemGroup>
Expand Down