Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Fix crash disconnecting the IndicatorView #11346

Merged
merged 3 commits into from
Dec 6, 2022
Merged

[Android] Fix crash disconnecting the IndicatorView #11346

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b2f7db
Fix crash disconnecting the IndicatorView on Android
jsuarezruiz Nov 14, 2022
632a49a
Merge branch 'main' into fix-11310
rmarinho Nov 17, 2022
aa44019
Added IndicatorViewStub
jsuarezruiz Nov 24, 2022
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
8 changes: 6 additions & 2 deletions src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ protected override MauiPageControl CreatePlatformView()
private protected override void OnConnectHandler(AView platformView)
{
base.OnConnectHandler(platformView);
PlatformView.SetIndicatorView(VirtualView);

if(platformView is MauiPageControl pageControl)
pageControl.SetIndicatorView(VirtualView);
}

private protected override void OnDisconnectHandler(AView platformView)
{
base.OnDisconnectHandler(platformView);
PlatformView.SetIndicatorView(null);

if (platformView is MauiPageControl pageControl)
pageControl.SetIndicatorView(null);
}

public static void MapCount(IIndicatorViewHandler handler, IIndicatorView indicator)
Expand Down
4 changes: 3 additions & 1 deletion src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ public partial class IndicatorViewHandler : ViewHandler<IIndicatorView, MauiPage
protected override void ConnectHandler(MauiPageControl platformView)
{
base.ConnectHandler(platformView);
PlatformView?.SetIndicatorView(VirtualView);

platformView?.SetIndicatorView(VirtualView);

UpdateIndicator();
}

Expand Down
7 changes: 5 additions & 2 deletions src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ public partial class IndicatorViewHandler : ViewHandler<IIndicatorView, MauiPage
protected override void ConnectHandler(MauiPageControl platformView)
{
base.ConnectHandler(platformView);
PlatformView?.SetIndicatorView(VirtualView);

platformView?.SetIndicatorView(VirtualView);

UpdateIndicator();
}

protected override void DisconnectHandler(MauiPageControl platformView)
{
base.DisconnectHandler(platformView);
PlatformView?.SetIndicatorView(null);

platformView?.SetIndicatorView(null);
}

public static void MapCount(IIndicatorViewHandler handler, IIndicatorView indicator)
Expand Down