diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs index 2264c49..c698caf 100644 --- a/TheGameExtreme.Android/MainActivity.cs +++ b/TheGameExtreme.Android/MainActivity.cs @@ -1,4 +1,4 @@ -using System; +using System; using Android.App; using Android.Content.PM; @@ -23,20 +23,35 @@ namespace TheGameExtreme.Droid Xamarin.Essentials.Platform.Init(this, savedInstanceState); Forms.Init(this, savedInstanceState); LoadApplication(new App()); + } + public override void OnWindowFocusChanged(bool hasFocus) + { + base.OnWindowFocusChanged(hasFocus); + if (hasFocus) + { + BarClose(); + } + } + public override void OnUserInteraction() + { + base.OnUserInteraction(); + 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)); + 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.Android/MainActivity.cs.orig b/TheGameExtreme.Android/MainActivity.cs.orig new file mode 100644 index 0000000..42d5b86 --- /dev/null +++ b/TheGameExtreme.Android/MainActivity.cs.orig @@ -0,0 +1,78 @@ +using System; + +using Android.App; +using Android.Content.PM; +using Android.Runtime; +using Android.Views; +using Android.Widget; +using Android.OS; +using Xamarin.Forms; + +namespace TheGameExtreme.Droid +{ + [Activity(Label = "OrderStacks", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)] + + public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity + { + protected override void OnCreate(Bundle savedInstanceState) + { + base.OnCreate(savedInstanceState); + + TabLayoutResource = Resource.Layout.Tabbar; + ToolbarResource = Resource.Layout.Toolbar; + Xamarin.Essentials.Platform.Init(this, savedInstanceState); + Forms.Init(this, savedInstanceState); + LoadApplication(new App()); + } + +<<<<<<< HEAD + public override void OnWindowFocusChanged(bool hasFocus) + { + base.OnWindowFocusChanged(hasFocus); + if (hasFocus) + { + BarClose(); + } + } + + public override void OnUserInteraction() + { + base.OnUserInteraction(); + 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)); + Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn); + +>>>>>>> 952c6827ab474c97c8f5426f3ea43c3472005093 + + 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); + + base.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; } }