icon à jour

master
Baptiste ARNAUD 5 years ago
commit 34befea50f

@ -1,7 +1,7 @@
<?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.uca.thegameextreme" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="TheGameExtreme.Android"></application>
<application android:label="TheGameExtreme.Android" android:icon="@drawable/TrierImageB"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

@ -5821,7 +5821,7 @@ namespace TheGameExtreme.Droid
public const int tooltip_frame_light = 2131165310;
// aapt resource value: 0x7F07007F
public const int TrierImage = 2131165311;
public const int TrierImageB = 2131165311;
// aapt resource value: 0x7F070080
public const int UsersExiticon = 2131165312;

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

@ -146,7 +146,13 @@
<AndroidResource Include="Resources\drawable\HomeIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\TrierImage.ico" />
<AndroidResource Include="Resources\TrierImageB.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\TrierImageB.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

@ -14,7 +14,7 @@
<AssemblyName>TheGameExtreme.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<ApplicationIcon>Resources\IconPique.jpg</ApplicationIcon>
<ApplicationIcon>Resources\IconPique60ptmax.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
@ -64,7 +64,7 @@
<AppExtensionDebugBundleId />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>IconPique.ico</ApplicationIcon>
<ApplicationIcon>TrierImageB.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Compile Include="Main.cs" />
@ -79,6 +79,8 @@
<LogicalName>TheGameExtreme.iOS.Resources.Apple.png</LogicalName>
</BundleResource>
<BundleResource Include="Resources\IconPique.ico" />
<BundleResource Include="Resources\IconPique60ptmax.ico" />
<BundleResource Include="IconPique.ico" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
@ -169,6 +171,9 @@
<BundleResource Include="Resources\TrierImage.ico" />
</ItemGroup>
<ItemGroup>
<Content Include="IconPique.ico" />
<BundleResource Include="Resources\TrierImageB.ico" />
</ItemGroup>
<ItemGroup>
<Content Include="TrierImageB.ico" />
</ItemGroup>
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

@ -40,6 +40,7 @@
<None Remove="Media\thegame.jpg" />
<None Remove="Media\Engrenage.jpeg" />
<None Remove="Media\moon.jpg" />
<None Remove="AppRessources-br.Designer.cs.orig" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Media\thegame.jpg" />

@ -1,74 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
=======
<PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
>>>>>>> master
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="model\event\" />
<Folder Include="viewmodel\" />
<Folder Include="model\card\" />
<Folder Include="model\deck\" />
<Folder Include="model\Card\rapidCard\" />
<Folder Include="model\gameActions\" />
<Folder Include="model\gameActions\extreme\" />
<Folder Include="model\gameActions\classic\" />
</ItemGroup>
<ItemGroup>
<Compile Remove="model\effect\StopColm.cs" />
<Compile Remove="model\effect\StopCom.cs" />
<Compile Remove="model\manager.cs" />
<Compile Remove="model\manager\GameManagerSolo.cs" />
<Compile Remove="view\AppRessources-br.Designer.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="AppRessources.config" />
<None Remove="view\Image\thegame.jpg" />
<None Remove="view\MultiPlayerMode.xaml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="view\Image\thegame.jpg" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Rules.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessource.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AppRessource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessources-br.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AppRessources-br.Designer.cs</LastGenOutput>
</EmbeddedResource>
<<<<<<< HEAD
=======
<EmbeddedResource Update="DictionnaireBGCBLACK.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Update="DictionnaireBGCWhite.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
>>>>>>> master
</ItemGroup>
<ItemGroup>
<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="AppRessource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>AppRessource.resx</DependentUpon>
</Compile>
<Compile Update="AppRessources-br.Designer.cs">
<DependentUpon>AppRessources-br.resx</DependentUpon>
</Compile>
</ItemGroup>
</Project>

@ -1,343 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using Xamarin.Forms;
using TheGameExtreme.model.@event;
using TheGameExtreme.viewmodel;
using SkiaSharp;
using System.IO;
using System.Reflection;
using SkiaSharp.Views.Forms;
using TouchTracking;
using Xamarin.Essentials;
namespace TheGameExtreme.view
{
// Learn more about making custom code visible in the Xamarin.Forms previewer
// by visiting https://aka.ms/xamarinforms-previewer
[DesignTimeVisible(false)]
public partial class MainPage : ContentPage
{
private bool isFirst = true;
private Main viewmodel;
private List<SKRect> stacks = new List<SKRect>();
Button button;
List<string> playersNames;
TouchManipulationBitmap bitmap;
List<TouchManipulationBitmap> bitmapCollection = new List<TouchManipulationBitmap>();
Dictionary<long, TouchManipulationBitmap> bitmapDictionary = new Dictionary<long, TouchManipulationBitmap>();
public MainPage(List<string> playersNames)
{
this.playersNames = playersNames;
InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
//Assembly assembly = GetType().GetTypeInfo().Assembly;
////string[] resourceIDs = assembly.GetManifestResourceNames();
//string resourceID = "TheGameExtreme.Media.thegame.jpg";
//SKPoint position = new SKPoint(100, (float)(DeviceDisplay.MainDisplayInfo.Height - 0.2 * DeviceDisplay.MainDisplayInfo.Height));
//for (int i = 0; i < 8; i++)
//{
// using (Stream stream = assembly.GetManifestResourceStream(resourceID))
// {
// SKBitmap bitmap = SKBitmap.Decode(stream).Resize(new SKImageInfo(225, 225), SKFilterQuality.High);
// bitmapCollection.Add(new TouchManipulationBitmap(bitmap)
// {
// Matrix = SKMatrix.MakeTranslation(position.X, position.Y - bitmap.Height),
// });
// position.X += bitmap.Width + 50;
// }
//}
//stacks.Add(checkbox0);
//stacks.Add(checkbox1);
//stacks.Add(checkbox2);
//stacks.Add(checkbox3);
//button.Text = "Retry";
//button.Clicked += retry;
viewmodel = new Main(playersNames);
//viewmodel.BindingChanged += OnBindingChanged;
//viewmodel.PlayerChanged += OnPlayerChanged;
viewmodel.AlertChanged += OnAlertChanged;
pseudo.SetBinding(Label.TextProperty, new Binding("Pseudo", source: viewmodel));
InflateHand();
}
private void OnAlertChanged(object sender, EventArgs args)
{
if (viewmodel.Alert != null)
{
DisplayAlert("", viewmodel.Alert, "OK");
viewmodel.Alert = null;
}
}
public void OnCanvasViewPaintSurface(object sender, SKPaintSurfaceEventArgs args) // Faire plusieurs canvas
{
SKCanvas canvas = args.Surface.Canvas;
canvas.Clear();
foreach (TouchManipulationBitmap bitmap in bitmapCollection)
{
bitmap.Paint(canvas);
}
}
public void OnTouchEffectAction(object sender, TouchActionEventArgs args)
{
// Convert Xamarin.Forms point to pixels
TouchTrackingPoint pt = args.Location;
SKPoint point =
new SKPoint((float)(canvasView.CanvasSize.Width * pt.X / canvasView.Width),
(float)(canvasView.CanvasSize.Height * pt.Y / canvasView.Height));
switch (args.Type)
{
case TouchActionType.Pressed:
for (int i = bitmapCollection.Count - 1; i >= 0; i--)
{
TouchManipulationBitmap bitmap = bitmapCollection[i];
if (bitmap.HitTest(point))
{
// Move bitmap to end of collection
bitmapCollection.Remove(bitmap);
bitmapCollection.Add(bitmap);
// Do the touch processing
bitmapDictionary.Add(args.Id, bitmap);
bitmap.ProcessTouchEvent(args.Id, args.Type, point);
canvasView.InvalidateSurface();
break;
}
}
break;
case TouchActionType.Moved:
if (bitmapDictionary.ContainsKey(args.Id))
{
TouchManipulationBitmap bitmap = bitmapDictionary[args.Id];
bitmap.ProcessTouchEvent(args.Id, args.Type, point);
canvasView.InvalidateSurface();
}
break;
case TouchActionType.Released:
case TouchActionType.Cancelled:
if (bitmapDictionary.ContainsKey(args.Id))
{
TouchManipulationBitmap bitmap = bitmapDictionary[args.Id];
bitmap.ProcessTouchEvent(args.Id, args.Type, point);
bitmapDictionary.Remove(args.Id);
canvasView.InvalidateSurface();
}
break;
}
}
public void OnTouchModePickerSelectedIndexChanged(object sender, EventArgs args)
{
if (bitmap != null)
{
Picker picker = (Picker)sender;
bitmap.TouchManager.Mode = (TouchManipulationMode)picker.SelectedItem;
}
}
<<<<<<< HEAD
//private void OnPlayerChanged(object sender, PlayerChangedEventArgs args)
//{
// inflateHand();
//}
=======
private void OnPlayerChanged(object sender, PlayerChangedEventArgs args)
{
InflateHand();
}
>>>>>>> 63f000719bc49139482f85661607797f88afe093
private void InflateHand()
{
//Hand.Children.Clear();
//for (int i = 0; i < viewmodel.CurrentHand.Count; i++)
//{
// Button card = new Button();
// card.Text = viewmodel.CurrentHand[i].Value.ToString();
// card.Clicked += played;
// Hand.Children.Add(card);
//}
bitmapCollection.Clear();
Assembly assembly = GetType().GetTypeInfo().Assembly;
string resourceID = "TheGameExtreme.Media.thegame.jpg";
SKPoint position = new SKPoint(100, (float)(DeviceDisplay.MainDisplayInfo.Height - 0.2 * DeviceDisplay.MainDisplayInfo.Height));
for (int i = 0; i < viewmodel.CurrentHand.Count; i++)
{
using (Stream stream = assembly.GetManifestResourceStream(resourceID))
{
SKBitmap bitmap = SKBitmap.Decode(stream).Resize(new SKImageInfo(225, 225), SKFilterQuality.High);
bitmapCollection.Add(new TouchManipulationBitmap(bitmap)
{
Matrix = SKMatrix.MakeTranslation(position.X, position.Y - bitmap.Height),
});
position.X += bitmap.Width + 50;
}
}
}
private void OnBindingChanged(object sender, TopRangeChangedEventArgs args)
{
//switch (args.NumStackChanged)
//{
// case 0:
// pile0.Text = args.NewTopRangeCard.Value.ToString();
// break;
// case 1:
// pile1.Text = args.NewTopRangeCard.Value.ToString();
// break;
// case 2:
// pile2.Text = args.NewTopRangeCard.Value.ToString();
// break;
// case 3:
// pile3.Text = args.NewTopRangeCard.Value.ToString();
// break;
//}
//for (int i = 0; i < Hand.Children.Count; i++)
//{
// Button b = Hand.Children[i] as Button;
// if (String.Equals(b.Text,args.NewTopRangeCard.Value.ToString()))
// {
// Hand.Children.RemoveAt(i);
// break;
// }
//}
}
private void played(object sender, EventArgs args)
{
int numStack = 0;
bool hasFind = false;
stacks.ForEach(checkbox =>
{
//if (checkbox.IsChecked)
//{
// hasFind = true;
// if (viewmodel.played(numStack, Convert.ToInt32((sender as Button).Text)))
// {
// botPanel.Children.Add(button);
// }
//}
numStack += 1;
});
if (!hasFind)
{
viewmodel.Alert = "Aucune pile selectionné! Veuillez séléctionner une pile.";
return;
}
}
//private void radioButton(object sender, EventArgs args)
//{
// if (isFirst)
// {
// isFirst = false;
// stacks.ForEach(checkbox =>
// {
// if (!checkbox.Equals(sender))
// {
// checkbox.IsChecked = false;
// }
// });
// isFirst = true;
// }
//}
private void retry(object sender, EventArgs args)
{
viewmodel = new Main(playersNames);
viewmodel.BindingChanged += OnBindingChanged;
pseudo.SetBinding(Label.TextProperty, new Binding("Pseudo", source: viewmodel));
inflateHand();
//pile0.Text = "1";
//pile1.Text = "1";
//pile2.Text = "100";
//pile3.Text = "100";
gameOption.Children.Clear();
gameOption.Children.Add(button);
}
private void EndTurn(object sender, EventArgs args)
{
if (viewmodel.endTurn())
{
button = (Button)gameOption.Children[0];
gameOption.Children.Clear();
Button retryButton = new Button();
retryButton.Text = "Retry";
retryButton.Clicked += retry;
gameOption.Children.Add(retryButton);
}
else
{
inflateHand();
}
}
private async void PlayToHome(object sender, EventArgs args)
{
await Navigation.PopToRootAsync();
}
}
}

Binary file not shown.
Loading…
Cancel
Save