Updated sample to use Xamarin.Forms 5.0

This commit is contained in:
Javier Suárez Ruiz 2020-11-21 19:12:36 +01:00
Родитель 3b73219187
Коммит f5738d7d99
8 изменённых файлов: 3766 добавлений и 1160 удалений

Просмотреть файл

@ -16,7 +16,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
@ -54,7 +53,7 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991220-pre3" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1709-pre4" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
</ItemGroup>
<ItemGroup>
@ -90,7 +89,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FavFighters\FavFighters.csproj">
<Project>{44BD8EB8-6267-41B7-A7D9-953118492AEA}</Project>
<Project>{BA958CB5-5363-4A46-9E4C-893F7CF332FA}</Project>
<Name>FavFighters</Name>
</ProjectReference>
</ItemGroup>

Просмотреть файл

@ -1,10 +1,6 @@
using System;
using Android.App;
using Android.App;
using Android.Content.PM;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using Android.OS;
namespace FavFighters.Droid

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="com.companyname.favfighters">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="FavFighters.Android"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="FavFighters.Android"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Foundation;
using Foundation;
using UIKit;
using Xamarin.Forms;
namespace FavFighters.iOS
{
@ -22,6 +19,7 @@ namespace FavFighters.iOS
//
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
Forms.SetFlags("SwipeView_Experimental");
global::Xamarin.Forms.Forms.Init();
LoadApplication(new App());

Просмотреть файл

@ -123,13 +123,13 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991220-pre3" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1709-pre4" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\FavFighters\FavFighters.csproj">
<Project>{44BD8EB8-6267-41B7-A7D9-953118492AEA}</Project>
<Project>{BA958CB5-5363-4A46-9E4C-893F7CF332FA}</Project>
<Name>FavFighters</Name>
</ProjectReference>
</ItemGroup>

Просмотреть файл

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991220-pre3" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1709-pre4" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
</ItemGroup>

Просмотреть файл

@ -68,11 +68,13 @@
<Setter Property="FontSize" Value="12" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="VerticalOptions" Value="Center" />
<Setter Property="Margin" Value="0, 36, 0, 0" />
<Setter Property="Margin" Value="0, 48, 0, 0" />
</Style>
<DataTemplate x:Key="MessageTemplate">
<SwipeView
Threshold="100"
BackgroundColor="Transparent"
HeightRequest="110">
<SwipeView.RightItems>
<SwipeItems
@ -94,7 +96,8 @@
</SwipeItems>
</SwipeView.RightItems>
<SwipeView.Content>
<Grid>
<Grid
BackgroundColor="Transparent">
<Frame
Style="{StaticResource FrameStyle}">
<Grid