From 969dbbbf922e7bb2b86c6553b663e23410a5622c Mon Sep 17 00:00:00 2001
From: 1011025m <37438176+1011025m@users.noreply.github.com>
Date: Sat, 13 May 2023 20:43:13 +0800
Subject: [PATCH] Regression, it didn't have to be over engineered

---
 Bloxstrap/Bootstrapper.cs                   |  6 ------
 Bloxstrap/Dialogs/BootstrapperDialogForm.cs |  3 ---
 Bloxstrap/Dialogs/ByfronDialog.xaml.cs      | 10 +---------
 Bloxstrap/Dialogs/FluentDialog.xaml.cs      |  3 ---
 Bloxstrap/Dialogs/IBootstrapperDialog.cs    |  1 -
 Bloxstrap/ViewModels/AppearanceViewModel.cs |  2 --
 6 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index 44d4e0d..5b915eb 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -709,8 +709,6 @@ namespace Bloxstrap
             {
                 Dialog.CancelEnabled = true;
                 Dialog.ProgressStyle = ProgressBarStyle.Continuous;
-                // Byfron dialog specific
-                Dialog.VersionVisibility = false;
             }
 
             // compute total bytes to download
@@ -793,11 +791,7 @@ namespace Bloxstrap
             }
 
             if (Dialog is not null)
-            {
                 Dialog.CancelEnabled = false;
-                // Byfron dialog specific
-                Dialog.VersionVisibility = true;
-            }
 
             App.State.Prop.VersionGuid = _latestVersionGuid;
 
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs
index 3bff244..64e5c5f 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs
+++ b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs
@@ -63,9 +63,6 @@ namespace Bloxstrap.Dialogs
                     _cancelEnabled = value;
             }
         }
-
-        // Byfron specific - not required here, bypassing
-        public bool VersionVisibility { get; set; }
         #endregion
 
         public void ScaleWindow()
diff --git a/Bloxstrap/Dialogs/ByfronDialog.xaml.cs b/Bloxstrap/Dialogs/ByfronDialog.xaml.cs
index 411930c..3a0a1f7 100644
--- a/Bloxstrap/Dialogs/ByfronDialog.xaml.cs
+++ b/Bloxstrap/Dialogs/ByfronDialog.xaml.cs
@@ -55,16 +55,8 @@ namespace Bloxstrap.Dialogs
             set
             {
                 _viewModel.CancelButtonVisibility = (value ? Visibility.Visible : Visibility.Collapsed);
+                _viewModel.VersionNumberVisibility = (value ? Visibility.Collapsed : Visibility.Visible);
                 _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility));
-            }
-        }
-
-        public bool VersionVisibility
-        {
-            get => _viewModel.VersionNumberVisibility == Visibility.Visible;
-            set
-            {
-                _viewModel.VersionNumberVisibility = (value ? Visibility.Visible : Visibility.Collapsed);
                 _viewModel.OnPropertyChanged(nameof(_viewModel.VersionNumberVisibility));
             }
         }
diff --git a/Bloxstrap/Dialogs/FluentDialog.xaml.cs b/Bloxstrap/Dialogs/FluentDialog.xaml.cs
index dd88b7c..ff65b08 100644
--- a/Bloxstrap/Dialogs/FluentDialog.xaml.cs
+++ b/Bloxstrap/Dialogs/FluentDialog.xaml.cs
@@ -63,9 +63,6 @@ namespace Bloxstrap.Dialogs
                 _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility));
             }
         }
-
-        // Byfron specific - not required here, bypassing
-        public bool VersionVisibility { get; set; }
         #endregion
 
         public FluentDialog()
diff --git a/Bloxstrap/Dialogs/IBootstrapperDialog.cs b/Bloxstrap/Dialogs/IBootstrapperDialog.cs
index 53b816b..e66b687 100644
--- a/Bloxstrap/Dialogs/IBootstrapperDialog.cs
+++ b/Bloxstrap/Dialogs/IBootstrapperDialog.cs
@@ -10,7 +10,6 @@ namespace Bloxstrap.Dialogs
         ProgressBarStyle ProgressStyle { get; set; }
         int ProgressValue { get; set; }
         bool CancelEnabled { get; set; }
-        bool VersionVisibility { get; set; }
 
         void ShowBootstrapper();
         void CloseBootstrapper();
diff --git a/Bloxstrap/ViewModels/AppearanceViewModel.cs b/Bloxstrap/ViewModels/AppearanceViewModel.cs
index 228385c..ba85815 100644
--- a/Bloxstrap/ViewModels/AppearanceViewModel.cs
+++ b/Bloxstrap/ViewModels/AppearanceViewModel.cs
@@ -36,8 +36,6 @@ namespace Bloxstrap.ViewModels
                 dialog.Message = "Style preview - Click Cancel to close";
 
             dialog.CancelEnabled = true;
-            // Byfron dialog specific
-            dialog.VersionVisibility = false;
             dialog.ShowBootstrapper();
         }