Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;

#if UITEST
using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;

#endif

namespace Xamarin.Forms.Controls.Issues
{
#if UITEST
[Category(UITestCategories.Button)]
#endif

[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 57717, "Setting background color on Button in Android FormsApplicationActivity causes NRE", PlatformAffected.Android)]
public class ButtonBackgroundColorTest : TestContentPage
{
const string ButtonText = "I am a button";

protected override void Init()
{
var layout = new StackLayout();

var instructions = new Label { Text = "If you can see this, the test has passed." };

var button = new Button { Text = ButtonText, BackgroundColor = Color.CornflowerBlue };

layout.Children.Add(instructions);
layout.Children.Add(button);

Content = layout;
}

#if UITEST
[Test]
public void ButtonBackgroundColorAutomatedTest()
{
// With the original bug in place, we'll crash before we get this far
RunningApp.WaitForElement(ButtonText);
}
#endif
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla55912.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla57317.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla57114.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ButtonBackgroundColorTest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ protected override void UpdateBackgroundColor()
if (Element == null || Control == null)
return;

_backgroundTracker.UpdateBackgroundColor();
_backgroundTracker?.UpdateBackgroundColor();
}

void UpdateAll()
Expand Down
12 changes: 7 additions & 5 deletions Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
_textColorSwitcher = new TextColorSwitcher(button.TextColors);
button.AddOnAttachStateChangeListener(this);
}
if (_backgroundTracker == null)
_backgroundTracker = new ButtonBackgroundTracker(Element, Control);
}

if (_backgroundTracker == null)
_backgroundTracker = new ButtonBackgroundTracker(Element, Control);
else
{
_backgroundTracker.Button = e.NewElement;
}

UpdateAll();
}
Expand All @@ -127,7 +126,10 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE

protected override void UpdateBackgroundColor()
{
_backgroundTracker.UpdateBackgroundColor();
if (Element == null || Control == null)
return;

_backgroundTracker?.UpdateBackgroundColor();
}

void UpdateAll()
Expand Down