From b0d725200c52e2dd9f558bc4dedb03ed06a4e641 Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Sat, 6 Mar 2021 23:06:05 +0100 Subject: [PATCH 1/9] [iOS] Fix popup default color and dark mode --- .../Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs index da137d302..a9badf739 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs @@ -18,7 +18,6 @@ public abstract class BasePopup : VisualElement /// protected BasePopup() { - Color = Color.White; VerticalOptions = LayoutOptions.CenterAndExpand; HorizontalOptions = LayoutOptions.CenterAndExpand; IsLightDismissEnabled = true; From 7cb3b33a589b73ff6baa0876eab26859db9ff956 Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Sat, 6 Mar 2021 23:13:16 +0100 Subject: [PATCH 2/9] [Android] Set correct background for default color --- .../Popup/Android/PopupRenderer.android.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index 5801c5308..8f5c21131 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -3,12 +3,16 @@ using Android.App; using Android.Content; using Android.Graphics.Drawables; +using Android.OS; using Android.Views; using Android.Widget; +using AndroidX.Core.Content; using Xamarin.CommunityToolkit.UI.Views; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; using static Android.App.ActionBar; +using AColor = Android.Graphics.Color; +using AColorRes = Android.Resource.Color; using AView = Android.Views.View; using FormsPlatform = Xamarin.Forms.Platform.Android.Platform; using GravityFlags = Android.Views.GravityFlags; @@ -124,7 +128,18 @@ void SetEvents() void SetColor() { - Window.SetBackgroundDrawable(new ColorDrawable(Element.Color.ToAndroid())); + if (Element.Color == Color.Default) + { + var color = Build.VERSION.SdkInt >= BuildVersionCodes.M ? + Context.Resources.GetColor(AColorRes.BackgroundLight, Context.Theme) : + new AColor(ContextCompat.GetColor(Context, AColorRes.BackgroundLight)); + + Window.SetBackgroundDrawable(new ColorDrawable(color)); + } + else + { + Window.SetBackgroundDrawable(new ColorDrawable(Element.Color.ToAndroid())); + } } void SetSize() From c731d10587f4a4c37af5cd08b246819b96ac7e37 Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Sun, 7 Mar 2021 10:53:58 +0100 Subject: [PATCH 3/9] [Android] GetWindowColor() for popup background color --- .../Popup/Android/PopupRenderer.android.cs | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index 8f5c21131..8b10cdb77 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -128,18 +128,17 @@ void SetEvents() void SetColor() { - if (Element.Color == Color.Default) - { - var color = Build.VERSION.SdkInt >= BuildVersionCodes.M ? - Context.Resources.GetColor(AColorRes.BackgroundLight, Context.Theme) : - new AColor(ContextCompat.GetColor(Context, AColorRes.BackgroundLight)); + Window.SetBackgroundDrawable(new ColorDrawable(GetWindowColor())); + } - Window.SetBackgroundDrawable(new ColorDrawable(color)); - } - else - { - Window.SetBackgroundDrawable(new ColorDrawable(Element.Color.ToAndroid())); - } + AColor GetWindowColor() + { + if (Element.Color != Color.Default) + return Element.Color.ToAndroid(); + + return Build.VERSION.SdkInt >= BuildVersionCodes.M + ? Context.Resources.GetColor(AColorRes.BackgroundLight, Context.Theme) + : new AColor(ContextCompat.GetColor(Context, AColorRes.BackgroundLight)); } void SetSize() From 576a141c1651f1db82ee0e06e6b777ad7407ff5d Mon Sep 17 00:00:00 2001 From: Andrei Date: Sun, 7 Mar 2021 23:58:26 +0100 Subject: [PATCH 4/9] Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs --- .../Views/Popup/Android/PopupRenderer.android.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index 8b10cdb77..1124f9f29 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -127,7 +127,6 @@ void SetEvents() } void SetColor() - { Window.SetBackgroundDrawable(new ColorDrawable(GetWindowColor())); } From dc74e73efeefcc82d3f4f69ccea6f9f95cdb34d3 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sun, 7 Mar 2021 23:58:31 +0100 Subject: [PATCH 5/9] Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs --- .../Views/Popup/Android/PopupRenderer.android.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index 1124f9f29..02242895b 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -127,8 +127,7 @@ void SetEvents() } void SetColor() - Window.SetBackgroundDrawable(new ColorDrawable(GetWindowColor())); - } + => Window.SetBackgroundDrawable(new ColorDrawable(GetWindowColor())); AColor GetWindowColor() { From 884a3511ae8065a06d5cf90a217291bc4d19cfa9 Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Mon, 8 Mar 2021 09:38:00 +0100 Subject: [PATCH 6/9] Update BasePopup.shared.cs --- .../Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs index a9badf739..3e4f40b86 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs @@ -18,6 +18,7 @@ public abstract class BasePopup : VisualElement /// protected BasePopup() { + Color = Color.Default; VerticalOptions = LayoutOptions.CenterAndExpand; HorizontalOptions = LayoutOptions.CenterAndExpand; IsLightDismissEnabled = true; From afeaa4b8f2cd527f7a6a11053c470b19a58defa8 Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Fri, 12 Mar 2021 10:30:48 +0100 Subject: [PATCH 7/9] Update PopupRenderer.android.cs --- .../Views/Popup/Android/PopupRenderer.android.cs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index cb28f7149..0ba804423 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -129,18 +129,7 @@ void SetEvents(in BasePopup basePopup) basePopup.Dismissed += OnDismissed; } - - AColor GetWindowColor() - { - if (Element.Color != Color.Default) - return Element.Color.ToAndroid(); - - return Build.VERSION.SdkInt >= BuildVersionCodes.M - ? Context.Resources.GetColor(AColorRes.BackgroundLight, Context.Theme) - : new AColor(ContextCompat.GetColor(Context, AColorRes.BackgroundLight)); - } - - void SetColor(in BasePopup basePopup) => Window?.SetBackgroundDrawable(new ColorDrawable(basePopup.Color.ToAndroid())); + void SetColor(in BasePopup basePopup) => Window?.SetBackgroundDrawable(new ColorDrawable(basePopup.Color.ToAndroid(AColorRes.BackgroundLight, Context))); void SetSize(in BasePopup basePopup) { From 3d5ca0ac915d33cb80610437e82decccd025c7bd Mon Sep 17 00:00:00 2001 From: Sebastian Klatte Date: Fri, 12 Mar 2021 10:32:06 +0100 Subject: [PATCH 8/9] Update PopupRenderer.android.cs --- .../Views/Popup/Android/PopupRenderer.android.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs index 0ba804423..d69e2477c 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs @@ -3,15 +3,12 @@ using Android.App; using Android.Content; using Android.Graphics.Drawables; -using Android.OS; using Android.Views; using Android.Widget; -using AndroidX.Core.Content; using Xamarin.CommunityToolkit.UI.Views; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; using static Android.App.ActionBar; -using AColor = Android.Graphics.Color; using AColorRes = Android.Resource.Color; using AView = Android.Views.View; using FormsPlatform = Xamarin.Forms.Platform.Android.Platform; From 414d6db69397d59318b8dedc97248403e4ed626c Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 13 Mar 2021 18:16:56 +0100 Subject: [PATCH 9/9] Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs --- .../Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs index 1bccf8a80..3940620ad 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs @@ -18,7 +18,6 @@ public abstract class BasePopup : VisualElement /// protected BasePopup() { - Color = Color.Default; VerticalOptions = LayoutOptions.CenterAndExpand; HorizontalOptions = LayoutOptions.CenterAndExpand; IsLightDismissEnabled = true;