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 dd8fe1b..5eb9e81 100644 Binary files a/com.uca.thegameextreme.apk and b/com.uca.thegameextreme.apk differ