[iOS] Fix popup default color and dark mode (#1041)

* [iOS] Fix popup default color and dark mode * [Android] Set correct background for default color * [Android] GetWindowColor() for popup background color * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs * Update BasePopup.shared.cs * Update PopupRenderer.android.cs * Update PopupRenderer.android.cs * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs Co-authored-by: Andrei <andrei.misiukevich@gmail.com> Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
xamarin · Mar 13, 2021 · 6630a8f · 6630a8f
1 parent 6e6a28f
commit 6630a8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -9,6 +9,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using static Android.App.ActionBar;
+using AColorRes = Android.Resource.Color;
 using AView = Android.Views.View;
 using FormsPlatform = Xamarin.Forms.Platform.Android.Platform;
 using GravityFlags = Android.Views.GravityFlags;
@@ -125,7 +126,7 @@ void SetEvents(in BasePopup basePopup)
 			basePopup.Dismissed += OnDismissed;
 		}
 
-		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)
 		{

diff --git 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
 		/// </summary>
 		protected BasePopup()
 		{
-			Color = Color.White;
 			VerticalOptions = LayoutOptions.CenterAndExpand;
 			HorizontalOptions = LayoutOptions.CenterAndExpand;
 			IsLightDismissEnabled = true;