SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve the flag editor warning viewmodel

Browse Source 
- no longer creates a new viewmodel every page reload
- fixes an oversight
This commit is contained in:
bluepilledgreat 2024-10-29 20:39:45 +00:00
parent ba561a2421
commit 81baca5ffa
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bloxstrap/UI/Elements/Settings/Pages/FastFlagEditorWarningPage.xaml.cs
View File

@ -12,7 +12,10 @@ namespace Bloxstrap.UI.Elements.Settings.Pages
public FastFlagEditorWarningPage() public FastFlagEditorWarningPage()
{ {
DataContext = new FastFlagEditorWarningViewModel(this); var vm = new FastFlagEditorWarningViewModel(this);
DataContext = vm;
vm.StartCountdown();
InitializeComponent(); InitializeComponent();
} }
@ -26,7 +29,7 @@ namespace Bloxstrap.UI.Elements.Settings.Pages
return; return;
} }
DataContext = new FastFlagEditorWarningViewModel(this); ((FastFlagEditorWarningViewModel)DataContext).StartCountdown();
} }
} }
} }

31
Bloxstrap/UI/ViewModels/Settings/FastFlagEditorWarningViewModel.cs
View File

@ -13,6 +13,8 @@ namespace Bloxstrap.UI.ViewModels.Settings
{ {
private Page _page; private Page _page;
private CancellationTokenSource? _cancellationTokenSource;
public string ContinueButtonText { get; set; } = ""; public string ContinueButtonText { get; set; } = "";
public bool CanContinue { get; set; } = false; public bool CanContinue { get; set; } = false;
@ -24,17 +26,34 @@ namespace Bloxstrap.UI.ViewModels.Settings
public FastFlagEditorWarningViewModel(Page page) public FastFlagEditorWarningViewModel(Page page)
{ {
_page = page; _page = page;
DoCountdown();
} }
private async void DoCountdown() public void StartCountdown()
{ {
_cancellationTokenSource?.Cancel();
_cancellationTokenSource = new CancellationTokenSource();
DoCountdown(_cancellationTokenSource.Token);
}
private async void DoCountdown(CancellationToken token)
{
CanContinue = false;
OnPropertyChanged(nameof(CanContinue));
for (int i = 10; i > 0; i--) for (int i = 10; i > 0; i--)
{ {
ContinueButtonText = $"({i}) {Strings.Menu_FastFlagEditor_Warning_Continue}"; ContinueButtonText = $"({i}) {Strings.Menu_FastFlagEditor_Warning_Continue}";
OnPropertyChanged(nameof(ContinueButtonText)); OnPropertyChanged(nameof(ContinueButtonText));
await Task.Delay(1000); try
{
await Task.Delay(1000, token);
}
catch (TaskCanceledException)
{
return;
}
} }
ContinueButtonText = Strings.Menu_FastFlagEditor_Warning_Continue; ContinueButtonText = Strings.Menu_FastFlagEditor_Warning_Continue;
@ -42,9 +61,6 @@ namespace Bloxstrap.UI.ViewModels.Settings
CanContinue = true; CanContinue = true;
OnPropertyChanged(nameof(CanContinue)); OnPropertyChanged(nameof(CanContinue));
App.State.Prop.ShowFFlagEditorWarning = false;
App.State.Save();
} }
private void Continue() private void Continue()
@ -52,6 +68,9 @@ namespace Bloxstrap.UI.ViewModels.Settings
if (!CanContinue) if (!CanContinue)
return; return;
App.State.Prop.ShowFFlagEditorWarning = false;
App.State.Save(); // should we be force saving here?
if (Window.GetWindow(_page) is INavigationWindow window) if (Window.GetWindow(_page) is INavigationWindow window)
window.Navigate(typeof(FastFlagEditorPage)); window.Navigate(typeof(FastFlagEditorPage));
} }