From cf4c91ca730ececfb4a8740a33058141dc56bd86 Mon Sep 17 00:00:00 2001 From: "Krzysztof Wieclaw/IoT & UI Sample (PLT) /SRPOL/Engineer/Samsung Electronics" Date: Tue, 14 Apr 2020 16:09:37 +0200 Subject: [PATCH] Add animation dispose to dispose method --- Oobe/Oobe.Common/Controls/ScrollableBase.cs | 1 + Oobe/Oobe/Controls/ViewStack.cs | 11 +++++++++++ Oobe/Oobe/Views/MainView.cs | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Oobe/Oobe.Common/Controls/ScrollableBase.cs b/Oobe/Oobe.Common/Controls/ScrollableBase.cs index 0e73f7e..e1a6fa2 100644 --- a/Oobe/Oobe.Common/Controls/ScrollableBase.cs +++ b/Oobe/Oobe.Common/Controls/ScrollableBase.cs @@ -646,6 +646,7 @@ namespace Oobe.Common.Controls mTapGestureDetector.Dispose(); mTapGestureDetector = null; } + scrollAnimation?.Dispose(); } base.Dispose(type); } diff --git a/Oobe/Oobe/Controls/ViewStack.cs b/Oobe/Oobe/Controls/ViewStack.cs index 61fc153..1059bb0 100644 --- a/Oobe/Oobe/Controls/ViewStack.cs +++ b/Oobe/Oobe/Controls/ViewStack.cs @@ -225,5 +225,16 @@ namespace Oobe.Controls TransitionFinished?.Invoke(this, new EventArgs()); } + protected override void Dispose(Tizen.NUI.DisposeTypes type) + { + if (disposed) + return; + if(type == DisposeTypes.Explicit) + { + pageEnterAnimation.Dispose(); + pageLeaveAnimation.Dispose(); + } + base.Dispose(type); + } } } diff --git a/Oobe/Oobe/Views/MainView.cs b/Oobe/Oobe/Views/MainView.cs index 1d2e39f..e9779ab 100644 --- a/Oobe/Oobe/Views/MainView.cs +++ b/Oobe/Oobe/Views/MainView.cs @@ -2,13 +2,14 @@ using Tizen.NUI.BaseComponents; using Tizen.NUI; using Oobe.Controls; using Tizen.NUI.Components; +using System; namespace Oobe.Views { /// /// Implementation of OOBE GUI Guideline for IoT Headed /// - public class MainView + public class MainView : IDisposable { private ViewStack stack; private Animation dimEffectAnimation; @@ -116,5 +117,12 @@ namespace Oobe.Views } dimEffectAnimation.Clear(); } + + public void Dispose() + { + dimEffectAnimation.Dispose(); + stack.Dispose(); + pagination.Dispose(); + } } } -- 2.7.4