added ok and cancel in modal

src/TypeCode.Wpf/Helper/Navigation/Modal/Service/IModalNavigationService.cs

@@ -3,5 +3,6 @@
 public interface IModalNavigationService
 {
 	Task OpenModalAsync(ModalParameter parameter);
-	Task CloseModalAsync();
+	Task OkAsync();
+	Task CancelAsync();
 }

src/TypeCode.Wpf/Helper/Navigation/Modal/Service/ModalButtons.cs

@@ -0,0 +1,7 @@
+namespace TypeCode.Wpf.Helper.Navigation.Modal.Service;
+
+public enum ModalButtons
+{
+    Ok,
+    OkAndCancel
+}

src/TypeCode.Wpf/Helper/Navigation/Modal/Service/ModalNavigationService.cs

@@ -54,14 +54,23 @@ public async Task OpenModalAsync(ModalParameter modalParameter)
 
         _lastModalParameter = modalParameter;
     }
+
+    public Task CancelAsync()
+    {
+        _mainViewProvider.MainWindow().Main.Opacity = 1;
+        _mainViewProvider.MainWindow().Main.IsEnabled = true;
+        _mainViewProvider.MainWindow().ModalOverlay.Visibility = Visibility.Collapsed;
+
+        return _lastModalParameter?.OnCancelAsync.Invoke() ?? Task.CompletedTask;
+    }
 
-    public Task CloseModalAsync()
+    public Task OkAsync()
     {
         _mainViewProvider.MainWindow().Main.Opacity = 1;
         _mainViewProvider.MainWindow().Main.IsEnabled = true;
         _mainViewProvider.MainWindow().ModalOverlay.Visibility = Visibility.Collapsed;
 
-        return _lastModalParameter?.OnCloseAsync.Invoke() ?? Task.CompletedTask;
+        return _lastModalParameter?.OnOkAsync.Invoke() ?? Task.CompletedTask;
     }
 
     private static Task CallOnNavigatedToOnCurrentViewModelAsync<T>(NavigationContext context, T viewModelInstance)

src/TypeCode.Wpf/Helper/Navigation/Modal/Service/ModalParameter.cs

@@ -4,11 +4,14 @@ public sealed class ModalParameter
 {
     public ModalParameter()
     {
-        OnCloseAsync = () => Task.CompletedTask;
+        Buttons = ModalButtons.Ok;
+        OnOkAsync = () => Task.CompletedTask;
+        OnCancelAsync = () => Task.CompletedTask;
     }
 
     public string? Title { get; set; }
     public string? Text { get; set; }
-    public bool ScrollViewerDisabled { get; set; }
-    public Func<Task> OnCloseAsync { get; set; }
+    public ModalButtons Buttons { get; set; }
+    public Func<Task> OnOkAsync { get; set; }
+    public Func<Task> OnCancelAsync { get; set; }
 }

src/TypeCode.Wpf/Helper/Navigation/Modal/View/ModalView.xaml

@@ -19,6 +19,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
+                <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"></RowDefinition>
@@ -30,16 +31,23 @@
                    Grid.ColumnSpan="2">
             </TextBlock>
             <ScrollViewer Margin="0,5,0,0" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
-                          HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
-                          Visibility="{Binding ScrollViewerEnabled, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
+                          HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <TextBlock Padding="2" Background="Transparent"
                          Text="{Binding Text, Mode=OneWay}"
                          TextWrapping="Wrap"
                          VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
             </ScrollViewer>
-
+            
             <Button Margin="0,5,0,0" Grid.Row="2" Grid.Column="1"
+                    Command="{Binding CancelCommand}"
+                    Visibility="{Binding OkVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Background="{StaticResource Primary}"
+                    BorderBrush="{StaticResource Secondary}"
+                    Content="Cancel" />
+
+            <Button Margin="5,5,0,0" Grid.Row="2" Grid.Column="2"
                     Command="{Binding OkCommand}"
+                    Visibility="{Binding OkVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
                     BorderBrush="{StaticResource Secondary}"
                     Content="Ok" />
         </Grid>

src/TypeCode.Wpf/Helper/Navigation/Modal/View/ModalViewModel.cs

@@ -21,22 +21,32 @@ public Task OnNavigatedToAsync(NavigationContext context)
         var parameter = context.GetParameter<ModalParameter>();
         Title = parameter.Title;
         Text = parameter.Text;
-        ScrollViewerEnabled = parameter.ScrollViewerDisabled;
+        OkVisible = parameter.Buttons is ModalButtons.Ok or ModalButtons.OkAndCancel;
+        CancelVisible = parameter.Buttons is ModalButtons.OkAndCancel;
         return Task.CompletedTask;
     }
 
     [RelayCommand]
     private Task OkAsync()
     {
-        return _modalNavigationService.CloseModalAsync();
+        return _modalNavigationService.OkAsync();
+    }
+
+    [RelayCommand]
+    private Task CancelAsync()
+    {
+        return _modalNavigationService.CancelAsync();
     }
 
     [ObservableProperty]
     private string? _title;
 
     [ObservableProperty]
     private string? _text;
-
+
+    [ObservableProperty]
+    private bool _okVisible;
+
     [ObservableProperty]
-    private bool _scrollViewerEnabled;
+    private bool _cancelVisible;
 }

src/TypeCode.Wpf/Main/Content/MainContentViewModel.cs

@@ -82,15 +82,15 @@ private Task UpdateAsync()
             throw new Exception("There is no new version available.");
         }
 
-        IsBannerVisible = false;
-
         return _modalNavigationService.OpenModalAsync(new ModalParameter
         {
             Title = "WARNING - Update (Installer)",
             Text = "The installer uses the location of the current version of TypeCode to install the update." +
                    " You can change the installation path (destination folder) in the advanced menu of the install wizard.",
-            OnCloseAsync = async () =>
+            OnOkAsync = async () =>
             {
+                IsBannerVisible = false;
+
                 var name = $"TypeCode.Wpf.Setup_{_version?.NewVersion}";
 
                 var url = $"https://github.com/byCrookie/TypeCode/releases/download/{_version?.NewVersion}/{name}.msi";