From 7db9d4ed5479b79fc4b769a0c84fd3b398bbf243 Mon Sep 17 00:00:00 2001 From: cldupland Date: Fri, 13 Dec 2019 15:43:49 +0100 Subject: [PATCH] Deploiement Playstore --- .../Properties/AndroidManifest.xml | 2 +- .../Services/MessageAndroid.cs | 8 ++------ TheGameExtreme/view/MainPage.xaml.cs | 7 +------ TheGameExtreme/view/TouchManipulationCard.cs | 14 +++++++++----- com.uca.thegameextreme.apk | Bin 39251541 -> 39247445 bytes 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml index c0e597c..9bce9bf 100644 --- a/TheGameExtreme.Android/Properties/AndroidManifest.xml +++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/TheGameExtreme.Android/Services/MessageAndroid.cs b/TheGameExtreme.Android/Services/MessageAndroid.cs index 7c3506b..6b9aa5e 100644 --- a/TheGameExtreme.Android/Services/MessageAndroid.cs +++ b/TheGameExtreme.Android/Services/MessageAndroid.cs @@ -15,16 +15,12 @@ namespace TheGameExtreme.Droid.Services public void LongAlert(string message) { - Toast toast = Toast.MakeText(Application.Context, message, ToastLength.Long); - toast.SetGravity(GravityFlags.Center | GravityFlags.Center, 0, 0); - toast.Show(); + Toast.MakeText(Application.Context, message, ToastLength.Long).Show(); } public void ShortAlert(string message) { - Toast toast = Toast.MakeText(Application.Context, message, ToastLength.Short); - toast.SetGravity(GravityFlags.Center | GravityFlags.Center, 0, 0); - toast.Show(); + Toast.MakeText(Application.Context, message, ToastLength.Short).Show(); } } } diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs index f356722..098cc18 100644 --- a/TheGameExtreme/view/MainPage.xaml.cs +++ b/TheGameExtreme/view/MainPage.xaml.cs @@ -56,11 +56,6 @@ namespace TheGameExtreme.view NavigationPage.SetHasNavigationBar(this, false); - if (Device.RuntimePlatform == Device.Android) - { - - } - EndTurnButton.Text = AppResources.StrEndTurn; viewmodel = new Main(this.playersNames, nbPile, nbCard, indexMode); @@ -285,7 +280,7 @@ namespace TheGameExtreme.view float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20); - SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20f - inflateWidth * 2f) / (viewmodel.CurrentHand.Count * 2)) + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.85) - (DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001")))); + SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20f - inflateWidth * 2f) / (viewmodel.CurrentHand.Count * 2)) + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.5 - (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001"))) + (float)((DeviceDisplay.MainDisplayInfo.Height * 0.1) + (DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.01 + 2 * (0.05f * (float)DeviceDisplay.MainDisplayInfo.Width * textPaint.TextSize / textPaint.MeasureText("001")))); position.X -= inflateWidth; diff --git a/TheGameExtreme/view/TouchManipulationCard.cs b/TheGameExtreme/view/TouchManipulationCard.cs index 8852975..08d961f 100644 --- a/TheGameExtreme/view/TouchManipulationCard.cs +++ b/TheGameExtreme/view/TouchManipulationCard.cs @@ -85,7 +85,7 @@ namespace TheGameExtreme.view textPaint.Color = Color; textPaint.StrokeWidth = 5; - textPaint.Style = SKPaintStyle.Stroke; + textPaint.Style = SKPaintStyle.StrokeAndFill; SKRect card; @@ -94,10 +94,10 @@ namespace TheGameExtreme.view card = new SKRect(-width, -height - textPaint.TextSize, width + textPaint.MeasureText(Math.Pow(10, ((FractionCard)(Value.View)).Fraction.SizeMax-1).ToString()), height); textPaint1.Color = Color; textPaint1.StrokeWidth = 5; - textPaint1.Style = SKPaintStyle.Stroke; + textPaint1.Style = SKPaintStyle.StrokeAndFill; textPaint2.Color = Color; textPaint2.StrokeWidth = 5; - textPaint2.Style = SKPaintStyle.Stroke; + textPaint2.Style = SKPaintStyle.StrokeAndFill; } else { @@ -144,14 +144,18 @@ namespace TheGameExtreme.view xDen -= textPaint2.MeasureText("-"); } - canvas.DrawRect(card, textPaint1); + SKPaint paint = textPaint1; + paint.Style = SKPaintStyle.Stroke; + canvas.DrawRect(card, paint); canvas.DrawText(((FractionCard)Value.View).Fraction.Numerateur.ToString(), xNum, -height * 0.5f, textPaint); canvas.DrawText(fractionBarre, -textPaint1.MeasureText("_") * 0.5f, -textPaint1.TextSize * 0.5f, textPaint1); canvas.DrawText(((FractionCard)Value.View).Fraction.Denominateur.ToString(), xDen, height * 0.5f, textPaint2); } else { - canvas.DrawRect(card, textPaint); + SKPaint paint = textPaint; + paint.Style = SKPaintStyle.Stroke; + canvas.DrawRect(card, paint); canvas.DrawText(display, 0, 0, textPaint); } diff --git a/com.uca.thegameextreme.apk b/com.uca.thegameextreme.apk index dd8fe1bb5f8b0b7ec19561d69e002a45a1ca13d9..5eb9e81e2492710152cdc791122002dea0a0ecf0 100644 GIT binary patch delta 970253 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