Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add link to Beta Site on final page #445

Merged
merged 1 commit into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions WPILibInstaller-Avalonia/ViewModels/FinalPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ public class FinalPageViewModel : PageViewModelBase

public ReactiveCommand<Unit, Unit> OpenChangelog { get; }

public ReactiveCommand<Unit, Unit> OpenBeta { get; }
public ReactiveCommand<Unit, Unit> OpenBetaSite { get; }

public ReactiveCommand<Unit, Unit> OpenBetaDocs { get; }

public FinalPageViewModel(IProgramWindow progWindow, IConfigurationProvider configurationProvider, IVsCodeInstallLocationProvider vsCodeProvider,
ICatchableButtonFactory buttonFactory)
Expand All @@ -47,7 +49,8 @@ public FinalPageViewModel(IProgramWindow progWindow, IConfigurationProvider conf

OpenKnownIssues = buttonFactory.CreateCatchableButton(OpenKnownIssuesFunc);
OpenChangelog = buttonFactory.CreateCatchableButton(OpenChangelogFunc);
OpenBeta = buttonFactory.CreateCatchableButton(OpenBetaFunc);
OpenBetaDocs = buttonFactory.CreateCatchableButton(OpenBetaDocsFunc);
OpenBetaSite = buttonFactory.CreateCatchableButton(OpenBetaSiteFunc);

this.progWindow = progWindow;
this.configurationProvider = configurationProvider;
Expand All @@ -59,12 +62,18 @@ public Task OpenKnownIssuesFunc()
return Task.CompletedTask;
}

public Task OpenBetaFunc()
public Task OpenBetaDocsFunc()
{
OpenBrowser("https://docs.wpilib.org/en/latest/docs/beta/beta-getting-started/welcome.html");
return Task.CompletedTask;
}

public Task OpenBetaSiteFunc()
{
OpenBrowser("https://github.com/wpilibsuite/2025Beta");
return Task.CompletedTask;
}

public Task OpenChangelogFunc()
{
string? verString = null;
Expand Down
5 changes: 4 additions & 1 deletion WPILibInstaller-Avalonia/Views/FinalPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,20,0,0">
Thank you for beta testing the 2025 WPILib!
</TextBlock>
<Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Beta Instructions" Command="{Binding OpenBeta}"></Button>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Beta Instructions" Command="{Binding OpenBetaDocs}"></Button>
<Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Beta Feedback Site" Command="{Binding OpenBetaSite}"></Button>
</StackPanel>
<TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding FinishText}">
</TextBlock>
</StackPanel>
Expand Down