From 5a96b20bdb1b631fd90860c0abed099447ca4ae4 Mon Sep 17 00:00:00 2001 From: cldupland Date: Thu, 12 Dec 2019 15:54:51 +0100 Subject: [PATCH] Deploiement playstore --- TheGameExtreme.Android/MainActivity.cs | 40 ++++++++++++++++---------- TheGameExtreme/view/MainPage.xaml | 3 -- TheGameExtreme/view/MainPage.xaml.cs | 8 +++--- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs index 8553e98..c33445d 100644 --- a/TheGameExtreme.Android/MainActivity.cs +++ b/TheGameExtreme.Android/MainActivity.cs @@ -23,25 +23,35 @@ namespace TheGameExtreme.Droid Xamarin.Essentials.Platform.Init(this, savedInstanceState); Forms.Init(this, savedInstanceState); LoadApplication(new App()); + } - Window.DecorView.SystemUiVisibility = (StatusBarVisibility) - (SystemUiFlags.LowProfile -| SystemUiFlags.Fullscreen -| SystemUiFlags.HideNavigation -| SystemUiFlags.Immersive - | SystemUiFlags.ImmersiveSticky); - Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn); + public override void OnWindowFocusChanged(bool hasFocus) + { + base.OnWindowFocusChanged(hasFocus); + if (hasFocus) + { + BarClose(); + } + } - /*int uiOptions = (int)Window.DecorView.SystemUiVisibility; - uiOptions |= (int)SystemUiFlags.LowProfile; - uiOptions |= (int)SystemUiFlags.Fullscreen; - uiOptions |= (int)SystemUiFlags.HideNavigation; - uiOptions |= (int)SystemUiFlags.ImmersiveSticky; - Window.DecorView.SystemUiVisibility = (StatusBarVisibility)uiOptions; - Window.SetStatusBarColor(Android.Graphics.Color.Argb(255, 0, 0, 0)); - */ + public override void OnUserInteraction() + { + base.OnUserInteraction(); + BarClose(); + } + private void BarClose() + { + Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn); + Window.DecorView.SystemUiVisibility = (StatusBarVisibility) + (SystemUiFlags.LowProfile + | SystemUiFlags.Fullscreen + | SystemUiFlags.HideNavigation + | SystemUiFlags.Immersive + | SystemUiFlags.ImmersiveSticky + ); } + public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults) { Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml index 3b0f573..7486b6d 100644 --- a/TheGameExtreme/view/MainPage.xaml +++ b/TheGameExtreme/view/MainPage.xaml @@ -93,9 +93,6 @@ PaintSurface="OnCanvasViewPaintSurface"/> - - - \ No newline at end of file diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs index 7bd1569..4a3a54d 100644 --- a/TheGameExtreme/view/MainPage.xaml.cs +++ b/TheGameExtreme/view/MainPage.xaml.cs @@ -231,7 +231,7 @@ namespace TheGameExtreme.view float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20); - SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.getListOrderedStacks().Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (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")))); + SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20f - inflateWidth * 2f) / (viewmodel.getListOrderedStacks().Count * 2)) + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f + 10f, (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; @@ -270,7 +270,7 @@ namespace TheGameExtreme.view Color = color }); - position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f; + position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20f - inflateWidth * 2f) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f; } } @@ -284,7 +284,7 @@ namespace TheGameExtreme.view float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20); - SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.CurrentHand.Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (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) - (DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001")))); position.X -= inflateWidth; @@ -313,7 +313,7 @@ namespace TheGameExtreme.view Color = SKColors.SkyBlue }); - position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.CurrentHand.Count) + textWidth * 0.5f; + position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20f - inflateWidth * 2f) / viewmodel.CurrentHand.Count) + textWidth * 0.5f; } }