From c06368c32922beb6471cf7c799e25eb206df0069 Mon Sep 17 00:00:00 2001
From: roubachof <jm.alfonsi@gmail.com>
Date: Thu, 23 Jun 2022 16:50:26 +0200
Subject: [PATCH] Fixed timed visibility when text is changing, adding
 ShowLastError to mix loaders and commands

---
 Retronado/Sample/Views/CommandsPage.xaml      | 291 +++++++++---------
 .../CompositeTaskLoaderNotifier.cs            |  45 ++-
 Sharpnado.TaskLoaderView/Snackbar.xaml.cs     |   4 +-
 .../TimedVisibilityBehavior.cs                |  51 ++-
 4 files changed, 229 insertions(+), 162 deletions(-)

diff --git a/Retronado/Sample/Views/CommandsPage.xaml b/Retronado/Sample/Views/CommandsPage.xaml
index 51f1a03..6b680e3 100644
--- a/Retronado/Sample/Views/CommandsPage.xaml
+++ b/Retronado/Sample/Views/CommandsPage.xaml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <ContentPage x:Class="Sample.Views.CommandsPage"
              xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -16,7 +17,6 @@
              x:DataType="viewModels:CommandsPageViewModel"
              NavigationPage.HasNavigationBar="false">
 
-
     <ContentPage.Content>
         <Grid>
             <Grid.RowDefinitions>
@@ -29,146 +29,151 @@
                                      BackgroundColor="{StaticResource TopElementBackground}"
                                      Theme="Standard" />
 
-            <RefreshView Grid.Row="1" IsRefreshing="{Binding Loader.ShowRefresher}"
+            <RefreshView Grid.Row="1"
+                         IsRefreshing="{Binding Loader.ShowRefresher}"
                          RefreshColor="{StaticResource AccentColor}"
                          Command="{Binding Loader.RefreshCommand}">
                 <ScrollView>
-                <tlv:TemplatedTaskLoader TaskLoaderNotifier="{Binding Loader}">
-                <tlv:TemplatedTaskLoader.ResultControlTemplate>
-                    <ControlTemplate>
-                        <Grid RowDefinitions="300,*"
-                              x:DataType="viewModels:CommandsPageViewModel"
-                              BindingContext="{Binding Source={RelativeSource AncestorType={x:Type viewModels:CommandsPageViewModel}}}">
-                    <Image Grid.Row="0"
-                           skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
-                           skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
-                           Aspect="Fill"
-                           Source="{Binding Loader.Result.ScreenshotUrl}" />
-
-                    <sho:MaterialFrame Grid.Row="0"
-                                       Padding="15,5,15,30"
-                                       VerticalOptions="End"
-                                       CornerRadius="0"
-                                       MaterialBlurStyle="Dark"
-                                       MaterialTheme="AcrylicBlur">
-                        <Grid Padding="0"
-                              ColumnDefinitions="*,60"
-                              RowDefinitions="40,20,20"
-                              RowSpacing="0">
-                            <Label Grid.Row="0"
-                                   Grid.Column="0"
-                                   Style="{StaticResource GameName}"
-                                   Margin="0,0,10,0"
-                                   skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
-                                   skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
-                                   Text="{Binding Loader.Result.Name}" />
-
-                            <Label Grid.Row="1"
-                                   Style="{StaticResource GameCompany}"
-                                   skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
-                                   skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
-                                   Text="{Binding Loader.Result.MajorCompany}" />
-
-                            <Label Grid.Row="2"
-                                   Style="{StaticResource GameGenre}"
-                                   Text="{Binding Loader.Result.MajorGenre}" />
-
-                            <Image Grid.Row="0"
-                                   Grid.RowSpan="3"
-                                   Grid.Column="1"
-                                   Margin="0,10,0,0"
-                                   Source="{Binding Loader.Result.CoverUrl}" />
-
-                        </Grid>
-                    </sho:MaterialFrame>
-
-                    <Button Grid.Row="1"
-                            HeightRequest="40"
-                            Margin="0,-20,100,0"
-                            Padding="10"
-                            HorizontalOptions="Center"
-                            VerticalOptions="Start"
-                            BackgroundColor="{StaticResource AccentColor}"
-                            Command="{Binding BuyGameCommand}"
-                            FontFamily="{StaticResource FontAtariSt}"
-                            Text="BUY IT"
-                            TextColor="{StaticResource TopElementBackground}" />
-
-                    <Button Grid.Row="1"
-                            HeightRequest="40"
-                            Margin="100,-20,0,0"
-                            Padding="10"
-                            HorizontalOptions="Center"
-                            VerticalOptions="Start"
-                            BackgroundColor="{StaticResource AccentColor}"
-                            Command="{Binding PlayTheGameCommand}"
-                            FontFamily="{StaticResource FontAtariSt}"
-                            Text="PLAY IT"
-                            TextColor="{StaticResource TopElementBackground}" />
-
-
-                    <Label Grid.Row="1"
-                           Style="{StaticResource GameGenre}"
-                           Margin="15,45,15,0"
-                           Text="{Binding Loader.Result.Summary}"
-                           TextColor="White" />
-                        </Grid>
-                    </ControlTemplate>
-                </tlv:TemplatedTaskLoader.ResultControlTemplate>
-                <tlv:TemplatedTaskLoader.LoadingControlTemplate>
-                    <ControlTemplate>
-                        <ActivityIndicator Color="{StaticResource AccentColor}"
-                                           IsRunning="True"
-                                           HorizontalOptions="Center"
-                                           VerticalOptions="Center"/>
-                    </ControlTemplate>
-                </tlv:TemplatedTaskLoader.LoadingControlTemplate>
-                <tlv:TemplatedTaskLoader.ErrorControlTemplate>
-                    <ControlTemplate x:DataType="{x:Null}">
-                        <StackLayout HorizontalOptions="Center"
-                                     VerticalOptions="Center"
-                                     BindingContext="{Binding Source={RelativeSource AncestorType={x:Type tlv:TemplatedTaskLoader}},
+                    <tlv:TemplatedTaskLoader TaskLoaderNotifier="{Binding Loader}">
+                        <tlv:TemplatedTaskLoader.ResultControlTemplate>
+                            <ControlTemplate>
+                                <Grid RowDefinitions="300,*"
+                                      x:DataType="viewModels:CommandsPageViewModel"
+                                      BindingContext="{Binding Source={RelativeSource
+                                            AncestorType={x:Type viewModels:CommandsPageViewModel}}}">
+                                    <Image Grid.Row="0"
+                                           skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
+                                           skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
+                                           Aspect="Fill"
+                                           Source="{Binding Loader.Result.ScreenshotUrl}" />
+
+                                    <sho:MaterialFrame Grid.Row="0"
+                                                       Padding="15,5,15,30"
+                                                       VerticalOptions="End"
+                                                       CornerRadius="0"
+                                                       MaterialBlurStyle="Dark"
+                                                       MaterialTheme="AcrylicBlur">
+                                        <Grid Padding="0"
+                                              ColumnDefinitions="*,60"
+                                              RowDefinitions="40,20,20"
+                                              RowSpacing="0">
+                                            <Label Grid.Row="0"
+                                                   Grid.Column="0"
+                                                   Style="{StaticResource GameName}"
+                                                   Margin="0,0,10,0"
+                                                   skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
+                                                   skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
+                                                   Text="{Binding Loader.Result.Name}" />
+
+                                            <Label Grid.Row="1"
+                                                   Style="{StaticResource GameCompany}"
+                                                   skeleton:Skeleton.BackgroundColor="{StaticResource GreyBackground}"
+                                                   skeleton:Skeleton.IsBusy="{Binding Loader.ShowLoader}"
+                                                   Text="{Binding Loader.Result.MajorCompany}" />
+
+                                            <Label Grid.Row="2"
+                                                   Style="{StaticResource GameGenre}"
+                                                   Text="{Binding Loader.Result.MajorGenre}" />
+
+                                            <Image Grid.Row="0"
+                                                   Grid.RowSpan="3"
+                                                   Grid.Column="1"
+                                                   Margin="0,10,0,0"
+                                                   Source="{Binding Loader.Result.CoverUrl}" />
+
+                                        </Grid>
+                                    </sho:MaterialFrame>
+
+                                    <Button Grid.Row="1"
+                                            HeightRequest="40"
+                                            Margin="0,-20,100,0"
+                                            Padding="10"
+                                            HorizontalOptions="Center"
+                                            VerticalOptions="Start"
+                                            BackgroundColor="{StaticResource AccentColor}"
+                                            Command="{Binding BuyGameCommand}"
+                                            FontFamily="{StaticResource FontAtariSt}"
+                                            Text="BUY IT"
+                                            TextColor="{StaticResource TopElementBackground}" />
+
+                                    <Button Grid.Row="1"
+                                            HeightRequest="40"
+                                            Margin="100,-20,0,0"
+                                            Padding="10"
+                                            HorizontalOptions="Center"
+                                            VerticalOptions="Start"
+                                            BackgroundColor="{StaticResource AccentColor}"
+                                            Command="{Binding PlayTheGameCommand}"
+                                            FontFamily="{StaticResource FontAtariSt}"
+                                            Text="PLAY IT"
+                                            TextColor="{StaticResource TopElementBackground}" />
+
+
+                                    <Label Grid.Row="1"
+                                           Style="{StaticResource GameGenre}"
+                                           Margin="15,45,15,0"
+                                           Text="{Binding Loader.Result.Summary}"
+                                           TextColor="White" />
+                                </Grid>
+                            </ControlTemplate>
+                        </tlv:TemplatedTaskLoader.ResultControlTemplate>
+
+                        <tlv:TemplatedTaskLoader.LoadingControlTemplate>
+                            <ControlTemplate>
+                                <ActivityIndicator Color="{StaticResource AccentColor}"
+                                                   IsRunning="True"
+                                                   HorizontalOptions="Center"
+                                                   VerticalOptions="Center" />
+                            </ControlTemplate>
+                        </tlv:TemplatedTaskLoader.LoadingControlTemplate>
+
+                        <tlv:TemplatedTaskLoader.ErrorControlTemplate>
+                            <ControlTemplate x:DataType="{x:Null}">
+                                <StackLayout HorizontalOptions="Center"
+                                             VerticalOptions="Center"
+                                             BindingContext="{Binding Source={RelativeSource AncestorType={x:Type tlv:TemplatedTaskLoader}},
                                           Path=TaskLoaderNotifier}"
-                                     Orientation="Vertical"
-                                     Spacing="10">
-                            <Frame CornerRadius="50"
-                                   HorizontalOptions="Center"
-                                   VerticalOptions="Center"
-                                   BackgroundColor="Transparent"
-                                   HasShadow="False"
-                                   IsClippedToBounds="True"
-                                   WidthRequest="100"
-                                   Padding="0"
-                                   HeightRequest="100"
-                                   Margin="0,0,0,10">
-                                <Image HorizontalOptions="Center"
-                                       VerticalOptions="Center"
-                                       WidthRequest="100"
-                                       HeightRequest="100"
-                                       Source="{Binding Error,
+                                             Orientation="Vertical"
+                                             Spacing="10">
+                                    <Frame CornerRadius="50"
+                                           HorizontalOptions="Center"
+                                           VerticalOptions="Center"
+                                           BackgroundColor="Transparent"
+                                           HasShadow="False"
+                                           IsClippedToBounds="True"
+                                           WidthRequest="100"
+                                           Padding="0"
+                                           HeightRequest="100"
+                                           Margin="0,0,0,10">
+                                        <Image HorizontalOptions="Center"
+                                               VerticalOptions="Center"
+                                               WidthRequest="100"
+                                               HeightRequest="100"
+                                               Source="{Binding Error,
                                     Converter={converters:ExceptionToImageSourceConverter}}" />
-                            </Frame>
-                            <Label Style="{StaticResource TextBodySecondary}"
-                                   WidthRequest="300"
-                                   Margin="0,0,0,20"
-                                   HorizontalTextAlignment="Center"
-                                   LineBreakMode="WordWrap"
-                                   MaxLines="2"
-                                   Text="{Binding Error,
+                                    </Frame>
+                                    <Label Style="{StaticResource TextBodySecondary}"
+                                           WidthRequest="300"
+                                           Margin="0,0,0,20"
+                                           HorizontalTextAlignment="Center"
+                                           LineBreakMode="WordWrap"
+                                           MaxLines="2"
+                                           Text="{Binding Error,
                               Converter={converters:ExceptionToErrorMessageConverter}}" />
 
-                                <Button BackgroundColor="{StaticResource AccentColor}"
-                                        CornerRadius="10"
-                                        Padding="10,0"
-                                        HorizontalOptions="Center"
-                                        VerticalOptions="End"
-                                        Command="{Binding ReloadCommand}"
-                                        TextColor="Black"
-                                        Text="{x:Static loc:SampleResources.ErrorButton_Retry}" />
-                        </StackLayout>
-                    </ControlTemplate>
-                </tlv:TemplatedTaskLoader.ErrorControlTemplate>
-            </tlv:TemplatedTaskLoader>
+                                    <Button BackgroundColor="{StaticResource AccentColor}"
+                                            CornerRadius="10"
+                                            Padding="10,0"
+                                            HorizontalOptions="Center"
+                                            VerticalOptions="End"
+                                            Command="{Binding ReloadCommand}"
+                                            TextColor="Black"
+                                            Text="{x:Static loc:SampleResources.ErrorButton_Retry}" />
+                                </StackLayout>
+                            </ControlTemplate>
+                        </tlv:TemplatedTaskLoader.ErrorControlTemplate>
+
+                    </tlv:TemplatedTaskLoader>
                 </ScrollView>
             </RefreshView>
 
@@ -199,14 +204,14 @@
             </AbsoluteLayout>
 
             <tlv:Snackbar Grid.Row="1"
-                            Margin="15"
-                            VerticalOptions="End"
-                            BackgroundColor="White"
-                            FontFamily="{StaticResource FontAtariSt}"
-                            IsVisible="{Binding CompositeNotifier.ShowAnyError, Mode=TwoWay}"
-                            Text="{Binding CompositeNotifier.LastError, Converter={StaticResource ExceptionToErrorMessageConverter}}"
-                            TextColor="{StaticResource TextPrimaryColor}"
-                            TextHorizontalOptions="Start" />
+                          Margin="15"
+                          VerticalOptions="End"
+                          BackgroundColor="White"
+                          FontFamily="{StaticResource FontAtariSt}"
+                          IsVisible="{Binding CompositeNotifier.ShowLastError, Mode=TwoWay}"
+                          Text="{Binding CompositeNotifier.LastError, Converter={StaticResource ExceptionToErrorMessageConverter}}"
+                          TextColor="{StaticResource TextPrimaryColor}"
+                          TextHorizontalOptions="Start" />
         </Grid>
     </ContentPage.Content>
 
diff --git a/Sharpnado.TaskLoaderView/CompositeTaskLoaderNotifier.cs b/Sharpnado.TaskLoaderView/CompositeTaskLoaderNotifier.cs
index 5d253c3..ba8fefe 100644
--- a/Sharpnado.TaskLoaderView/CompositeTaskLoaderNotifier.cs
+++ b/Sharpnado.TaskLoaderView/CompositeTaskLoaderNotifier.cs
@@ -33,7 +33,7 @@ public partial class CompositeTaskLoaderNotifier : ITaskLoaderNotifier
         private bool _showError;
         private bool _showEmptyState;
         private bool _showErrorNotification;
-        private bool _showAnyError;
+        private bool _showLastError;
 
         private bool _isRunningOrSuccessfullyCompleted;
 
@@ -156,7 +156,11 @@ public bool ShowError
                 if (SetAndRaise(ref _showError, value))
                 {
                     InternalLogger.Debug(Tag, () => $"ShowError: {_showError}");
-                    ShowAnyError = ShowErrorNotification || ShowError;
+                }
+
+                if (value)
+                {
+                    ShowLastError = ShowError;
                 }
             }
         }
@@ -169,19 +173,23 @@ public bool ShowErrorNotification
                 if (SetAndRaise(ref _showErrorNotification, value))
                 {
                     InternalLogger.Debug(Tag, () => $"ShowErrorNotification: {_showErrorNotification}");
-                    ShowAnyError = ShowErrorNotification || ShowError;
+
+                    if (value)
+                    {
+                        ShowLastError = ShowErrorNotification;
+                    }
                 }
             }
         }
 
-        public bool ShowAnyError
+        public bool ShowLastError
         {
-            get => _showAnyError;
+            get => _showLastError;
             set
             {
-                if (SetAndRaise(ref _showAnyError, value))
+                if (SetAndRaise(ref _showLastError, value))
                 {
-                    InternalLogger.Debug(Tag, () => $"ShowAnyError: {_showAnyError}");
+                    InternalLogger.Debug(Tag, () => $"ShowAnyError: {_showLastError} (notif: {_showErrorNotification}, error: {_showError})");
                 }
             }
         }
@@ -342,10 +350,15 @@ private void LoaderOnPropertyChanged(object sender, PropertyChangedEventArgs e)
                         return;
                     }
 
-                    ShowError = taskNotifier.ShowError
-                        && _loaders.Any(l => l.ShowError && !_mainLoaders.Contains(l));
+                    InternalLogger.Debug(Tag, () =>
+                    {
+                        // bool any = _loaders.Any(l => l.ShowError && !_mainLoaders.Contains(l));
+                        return $"LoaderOnPropertyChanged() => setting ShowError, taskNotifier.ShowError = {taskNotifier.ShowError}";
+                    });
+
+                    ShowError = taskNotifier.ShowError;
 
-                    LastError = taskNotifier.Error;
+                    LastError = taskNotifier.Error ?? LastError;
                     Error = IsFaulted
                         ? new AggregateException(
                             _loaders
@@ -355,10 +368,16 @@ private void LoaderOnPropertyChanged(object sender, PropertyChangedEventArgs e)
                     break;
 
                 case nameof(ShowErrorNotification):
-                    ShowErrorNotification = taskNotifier.ShowErrorNotification
-                        && _loaders.Any(l => l.ShowErrorNotification);
 
-                    LastError = taskNotifier.Error;
+                    InternalLogger.Debug(Tag, () =>
+                    {
+                        // bool any = _loaders.Any(l => l.ShowErrorNotification);
+                        return $"LoaderOnPropertyChanged() => setting ShowErrorNotification, taskNotifier.ShowErrorNotification = {taskNotifier.ShowErrorNotification}";
+                    });
+
+                    ShowErrorNotification = taskNotifier.ShowErrorNotification;
+
+                    LastError = taskNotifier.Error ?? LastError;
                     Error = IsFaulted
                         ? new AggregateException(
                             _loaders
diff --git a/Sharpnado.TaskLoaderView/Snackbar.xaml.cs b/Sharpnado.TaskLoaderView/Snackbar.xaml.cs
index 0dc98dc..66c6a04 100644
--- a/Sharpnado.TaskLoaderView/Snackbar.xaml.cs
+++ b/Sharpnado.TaskLoaderView/Snackbar.xaml.cs
@@ -4,7 +4,7 @@
 namespace Sharpnado.TaskLoaderView
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class Snackbar : Frame
+    public partial class Snackbar : Frame, ITimeVisibilityText
     {
         public static readonly BindableProperty TextProperty = BindableProperty.Create(
             nameof(Text),
@@ -81,4 +81,4 @@ public int DisplayDurationMilliseconds
             set => SetValue(DisplayDurationMillisecondsProperty, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Sharpnado.TaskLoaderView/TimedVisibilityBehavior.cs b/Sharpnado.TaskLoaderView/TimedVisibilityBehavior.cs
index 4e6ff36..582bb03 100644
--- a/Sharpnado.TaskLoaderView/TimedVisibilityBehavior.cs
+++ b/Sharpnado.TaskLoaderView/TimedVisibilityBehavior.cs
@@ -1,9 +1,15 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Xamarin.Forms;
 
 namespace Sharpnado.TaskLoaderView
 {
+    public interface ITimeVisibilityText
+    {
+        string Text { get; }
+    }
+
     public class TimedVisibilityBehavior : Behavior<View>
     {
         public static readonly BindableProperty VisibilityInMillisecondsProperty = BindableProperty.Create(
@@ -12,8 +18,14 @@ public class TimedVisibilityBehavior : Behavior<View>
             typeof(TimedVisibilityBehavior),
             5000);
 
+        private const string Tag = "TimedVisibility";
+
         private bool _lastVisibility;
 
+        private string _lastViewText = string.Empty;
+
+        private CancellationTokenSource _cancellationTokenSource;
+
         public int VisibilityInMilliseconds
         {
             get => (int)GetValue(VisibilityInMillisecondsProperty);
@@ -26,17 +38,42 @@ protected override void OnAttachedTo(View bindable)
             bindable.PropertyChanged += ViewPropertyChanged;
         }
 
+        private bool ViewTextHasChanged(string propertyName, ITimeVisibilityText viewWithText)
+        {
+            bool hasChanged = propertyName == nameof(ITimeVisibilityText.Text) && viewWithText.Text != _lastViewText;
+            if (hasChanged)
+            {
+                _lastViewText = viewWithText.Text;
+            }
+
+            return hasChanged;
+        }
+
         private async void ViewPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             var view = (View)sender;
-            if (e.PropertyName != nameof(view.IsVisible))
+            if (e.PropertyName != nameof(view.IsVisible)
+                && !(view is ITimeVisibilityText snackbar && ViewTextHasChanged(e.PropertyName, snackbar)))
             {
                 return;
             }
 
+            InternalLogger.Debug(Tag, () => $"Canceling wait");
+            _cancellationTokenSource?.Cancel();
             if (!_lastVisibility && view.IsVisible)
             {
-                await Task.Delay(VisibilityInMilliseconds);
+                try
+                {
+                    _cancellationTokenSource = new CancellationTokenSource();
+                    await Wait(VisibilityInMilliseconds, _cancellationTokenSource.Token);
+                }
+                catch (TaskCanceledException exception)
+                {
+                    InternalLogger.Debug(Tag, () => $"Wait has been cancelled");
+                    return;
+                }
+
+                InternalLogger.Debug(Tag, () => $"setting view visibility to false");
                 view.IsVisible = false;
             }
             else
@@ -44,5 +81,11 @@ private async void ViewPropertyChanged(object sender, System.ComponentModel.Prop
                 _lastVisibility = view.IsVisible;
             }
         }
+
+        private Task Wait(int milliseconds, CancellationToken token)
+        {
+            InternalLogger.Debug(Tag, () => $"Wait: {milliseconds}ms");
+            return Task.Delay(milliseconds, token);
+        }
     }
-}
\ No newline at end of file
+}