From 4b06bc212f0ff9b813693d6acbeaf23ccac38091 Mon Sep 17 00:00:00 2001 From: adrianknight89 Date: Fri, 30 Sep 2016 14:22:02 -0500 Subject: =?UTF-8?q?AppCompat=20should=20now=20be=20able=20to=20set=20title?= =?UTF-8?q?=20bar=20visibility=20programmatic=E2=80=A6=20(#350)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AppCompat should now be able to set title bar visibility programmatically * coding style changes * making sure page layout runs only on fullscreen flag changes --- .../AppCompat/FormsAppCompatActivity.cs | 34 +++++++++++++++++++++- .../AppCompat/Platform.cs | 12 ++++---- 2 files changed, 39 insertions(+), 7 deletions(-) (limited to 'Xamarin.Forms.Platform.Android/AppCompat') diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index ab2fb61a..83a2950c 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -41,7 +41,7 @@ namespace Xamarin.Forms.Platform.Android AndroidApplicationLifecycleState _previousState; - bool _renderersAdded; + bool _renderersAdded, _isFullScreen; int _statusBarHeight = -1; global::Android.Views.View _statusBarUnderlay; @@ -468,6 +468,38 @@ namespace Xamarin.Forms.Platform.Android SetStatusBarVisibility(adjust); } + public override void OnWindowAttributesChanged(WindowManagerLayoutParams @params) + { + base.OnWindowAttributesChanged(@params); + + if (Xamarin.Forms.Application.Current == null || Xamarin.Forms.Application.Current.MainPage == null) + return; + + if (@params.Flags.HasFlag(WindowManagerFlags.Fullscreen)) + { + if (Forms.TitleBarVisibility != AndroidTitleBarVisibility.Never) + Forms.TitleBarVisibility = AndroidTitleBarVisibility.Never; + + if (_isFullScreen) + return; + } + else + { + if (Forms.TitleBarVisibility != AndroidTitleBarVisibility.Default) + Forms.TitleBarVisibility = AndroidTitleBarVisibility.Default; + + if (!_isFullScreen) + return; + } + + _isFullScreen = !_isFullScreen; + + var displayMetrics = Resources.DisplayMetrics; + var width = displayMetrics.WidthPixels; + var height = displayMetrics.HeightPixels; + AppCompat.Platform.LayoutRootPage(this, Xamarin.Forms.Application.Current.MainPage, width, height); + } + void SetStatusBarVisibility(SoftInput mode) { if (!Forms.IsLollipopOrNewer) diff --git a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs index f656ff84..eb23c4de 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs @@ -193,7 +193,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat void IPlatformLayout.OnLayout(bool changed, int l, int t, int r, int b) { if (changed) - LayoutRootPage(Page, r - l, b - t); + LayoutRootPage((FormsAppCompatActivity)_context, Page, r - l, b - t); Android.Platform.GetRenderer(Page).UpdateLayout(); @@ -251,7 +251,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat Android.Platform.SetRenderer(page, renderView); if (layout) - LayoutRootPage(page, _renderer.Width, _renderer.Height); + LayoutRootPage((FormsAppCompatActivity)_context, page, _renderer.Width, _renderer.Height); _renderer.AddView(renderView.ViewGroup); } @@ -267,16 +267,16 @@ namespace Xamarin.Forms.Platform.Android.AppCompat return handled; } - void LayoutRootPage(Page page, int width, int height) + internal static void LayoutRootPage(FormsAppCompatActivity activity, Page page, int width, int height) { - var activity = (FormsAppCompatActivity)_context; int statusBarHeight = Forms.IsLollipopOrNewer ? activity.GetStatusBarHeight() : 0; + statusBarHeight = activity.Window.Attributes.Flags.HasFlag(WindowManagerFlags.Fullscreen) || Forms.TitleBarVisibility == AndroidTitleBarVisibility.Never ? 0 : statusBarHeight; if (page is MasterDetailPage) - page.Layout(new Rectangle(0, 0, _context.FromPixels(width), _context.FromPixels(height))); + page.Layout(new Rectangle(0, 0, activity.FromPixels(width), activity.FromPixels(height))); else { - page.Layout(new Rectangle(0, _context.FromPixels(statusBarHeight), _context.FromPixels(width), _context.FromPixels(height - statusBarHeight))); + page.Layout(new Rectangle(0, activity.FromPixels(statusBarHeight), activity.FromPixels(width), activity.FromPixels(height - statusBarHeight))); } } -- cgit v1.2.3