From 42a13211d796bfdd3a868d377983b983e8356899 Mon Sep 17 00:00:00 2001 From: cldupland Date: Fri, 15 Nov 2019 15:08:38 +0100 Subject: [PATCH] Ajout du drag and drop --- TestUnitaire/TestUnitaire.csproj | 23 ++++ TestUnitaire/packages.config | 3 + .../TheGameExtreme.Android.csproj | 3 + TheGameExtreme.iOS/AppDelegate.cs | 3 +- TheGameExtreme.iOS/TheGameExtreme.iOS.csproj | 3 + .../{view/Image => Media}/thegame.jpg | Bin TheGameExtreme/TheGameExtreme.csproj | 7 +- TheGameExtreme/view/MainPage.xaml | 84 +++++++++++---- TheGameExtreme/view/MainPage.xaml.cs | 99 +++++++++++++++++- 9 files changed, 195 insertions(+), 30 deletions(-) rename TheGameExtreme/{view/Image => Media}/thegame.jpg (100%) diff --git a/TestUnitaire/TestUnitaire.csproj b/TestUnitaire/TestUnitaire.csproj index f6fdffd..076dacf 100644 --- a/TestUnitaire/TestUnitaire.csproj +++ b/TestUnitaire/TestUnitaire.csproj @@ -1,5 +1,6 @@  + Debug @@ -36,6 +37,27 @@ ..\packages\Xamarin.UITest.3.0.3\lib\net45\Xamarin.UITest.dll + + ..\packages\TouchTracking.1.1.0\lib\netstandard1.3\TouchTracking.dll + + + ..\packages\Xamarin.Forms.3.0.0.446417\lib\netstandard2.0\Design\Xamarin.Forms.Core.Design.dll + + + ..\packages\Xamarin.Forms.3.0.0.446417\lib\netstandard2.0\Design\Xamarin.Forms.Xaml.Design.dll + + + ..\packages\Xamarin.Forms.3.0.0.446417\lib\netstandard2.0\Xamarin.Forms.Core.dll + + + ..\packages\Xamarin.Forms.3.0.0.446417\lib\netstandard2.0\Xamarin.Forms.Platform.dll + + + ..\packages\Xamarin.Forms.3.0.0.446417\lib\netstandard2.0\Xamarin.Forms.Xaml.dll + + + ..\packages\TouchTracking.Forms.1.1.0\lib\netstandard1.3\TouchTracking.Forms.dll + @@ -45,4 +67,5 @@ + \ No newline at end of file diff --git a/TestUnitaire/packages.config b/TestUnitaire/packages.config index fdddf2c..f3eaa94 100644 --- a/TestUnitaire/packages.config +++ b/TestUnitaire/packages.config @@ -1,5 +1,8 @@  + + + \ No newline at end of file diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj index 1b55563..2f10e31 100644 --- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj +++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj @@ -58,6 +58,9 @@ 1.68.0 + + 1.1.0 + diff --git a/TheGameExtreme.iOS/AppDelegate.cs b/TheGameExtreme.iOS/AppDelegate.cs index b09f94d..d3736f2 100644 --- a/TheGameExtreme.iOS/AppDelegate.cs +++ b/TheGameExtreme.iOS/AppDelegate.cs @@ -22,7 +22,8 @@ namespace TheGameExtreme.iOS // public override bool FinishedLaunching(UIApplication app, NSDictionary options) { - global::Xamarin.Forms.Forms.Init(); + global::Xamarin.Forms.Forms.Init(); + var _ = new TouchTracking.Forms.iOS.TouchEffect(); LoadApplication(new App()); return base.FinishedLaunching(app, options); diff --git a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj index 7fe5148..5fdc1c6 100644 --- a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj +++ b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj @@ -135,6 +135,9 @@ 1.68.0 + + 1.1.0 + diff --git a/TheGameExtreme/view/Image/thegame.jpg b/TheGameExtreme/Media/thegame.jpg similarity index 100% rename from TheGameExtreme/view/Image/thegame.jpg rename to TheGameExtreme/Media/thegame.jpg diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index 9bab3c2..4d76aa9 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -9,6 +9,7 @@ + @@ -19,6 +20,8 @@ + + @@ -29,11 +32,11 @@ - + - + diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml index 0f65ad4..0d9e1c5 100644 --- a/TheGameExtreme/view/MainPage.xaml +++ b/TheGameExtreme/view/MainPage.xaml @@ -5,6 +5,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:skia="clr-namespace:SkiaSharp.Views.Forms;assembly=SkiaSharp.Views.Forms" + xmlns:tt="clr-namespace:TouchTracking.Forms;assembly=TouchTracking.Forms" mc:Ignorable="d" x:Class="TheGameExtreme.view.MainPage"> @@ -13,35 +15,73 @@ - + + + + + + -