Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

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

Merged
merged 10 commits into from
Mar 13, 2021
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b0d7252
[iOS] Fix popup default color and dark mode
geskill Mar 6, 2021
7cb3b33
[Android] Set correct background for default color
geskill Mar 6, 2021
c731d10
[Android] GetWindowColor() for popup background color
geskill Mar 7, 2021
576a141
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Andr…
AndreiMisiukevich Mar 7, 2021
dc74e73
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Andr…
AndreiMisiukevich Mar 7, 2021
884a351
Update BasePopup.shared.cs
geskill Mar 8, 2021
0541c61
Merge branch 'develop' into patch-1
brminnick Mar 9, 2021
afeaa4b
Update PopupRenderer.android.cs
geskill Mar 12, 2021
3d5ca0a
Update PopupRenderer.android.cs
geskill Mar 12, 2021
414d6db
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Base…
AndreiMisiukevich Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -124,7 +128,17 @@ void SetEvents()

void SetColor()
{
AndreiMisiukevich marked this conversation as resolved.
Show resolved Hide resolved
Window.SetBackgroundDrawable(new ColorDrawable(Element.Color.ToAndroid()));
Window.SetBackgroundDrawable(new ColorDrawable(GetWindowColor()));
}
AndreiMisiukevich marked this conversation as resolved.
Show resolved Hide resolved

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()
Expand Down
1 change: 0 additions & 1 deletion src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public abstract class BasePopup : VisualElement
/// </summary>
protected BasePopup()
{
Color = Color.White;
geskill marked this conversation as resolved.
Show resolved Hide resolved
VerticalOptions = LayoutOptions.CenterAndExpand;
HorizontalOptions = LayoutOptions.CenterAndExpand;
IsLightDismissEnabled = true;
Expand Down