Skip to content

Commit

Permalink
Open store page in msix version update check for the time being.
Browse files Browse the repository at this point in the history
  • Loading branch information
rocksdanister committed Apr 26, 2024
1 parent 913fff6 commit 06ecd16
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 45 deletions.
8 changes: 7 additions & 1 deletion src/Lively/Lively.UI.WinUI/ViewModels/AppUpdateViewModel.cs
Expand Up @@ -117,6 +117,12 @@ private async Task CheckUpdate()
}
}

[RelayCommand]
private void OpenStorePage()
{
LinkUtil.OpenBrowser("ms-windows-store://pdp/?productid=9NTM2QC6QWS7");
}

[RelayCommand]
private async Task DownloadUpdate()
{
Expand Down Expand Up @@ -198,7 +204,7 @@ private void UpdateState(AppUpdateStatus status, DateTime date, Version version)
break;
case AppUpdateStatus.notchecked:
IsUpdateAvailable = false;
UpdateStatusSeverity = "Warning";
UpdateStatusSeverity = IsWinStore ? "Informational" : "Warning";
UpdateStatusText = languageResource.GetString("TextUpdateChecking");
break;
case AppUpdateStatus.error:
Expand Down
98 changes: 54 additions & 44 deletions src/Lively/Lively.UI.WinUI/Views/Pages/AppUpdateView.xaml
Expand Up @@ -86,58 +86,68 @@
NavigateUri="https://github.com/rocksdanister/lively/releases" />-->
</StackPanel>
</controls:SettingsCard.Description>
<Grid VerticalAlignment="Center" Visibility="{Binding IsWinStore, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
<Grid Visibility="{Binding IsUpdateAvailable, Mode=OneWay, Converter={StaticResource VisibilityConverter}}">
<!-- Download -->
<Grid>
<Grid VerticalAlignment="Center" Visibility="{Binding IsWinStore, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
<Grid Visibility="{Binding IsUpdateAvailable, Mode=OneWay, Converter={StaticResource VisibilityConverter}}">
<!-- Download -->
<Button
x:Uid="TextDownload"
MinWidth="100"
HorizontalAlignment="Right"
Background="{ThemeResource SystemAccentColor}"
Command="{Binding DownloadUpdateCommand}"
Visibility="{Binding IsUpdateDownloaded, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
<Button.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</Button.Resources>
</Button>
<!-- Install -->
<Button
x:Uid="TextInstall"
MinWidth="100"
HorizontalAlignment="Right"
Background="{ThemeResource SystemAccentColor}"
Command="{Binding InstallUpdateCommand}"
Visibility="{Binding IsUpdateDownloaded, Mode=OneWay, Converter={StaticResource VisibilityConverter}}">
<Button.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</Button.Resources>
</Button>
</Grid>
<!-- Check for update -->
<Button
x:Uid="TextDownload"
x:Uid="TextUpdateCheck"
MinWidth="100"
HorizontalAlignment="Right"
Background="{ThemeResource SystemAccentColor}"
Command="{Binding DownloadUpdateCommand}"
Visibility="{Binding IsUpdateDownloaded, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
<Button.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</Button.Resources>
</Button>
<!-- Install -->
<Button
x:Uid="TextInstall"
MinWidth="100"
HorizontalAlignment="Right"
Background="{ThemeResource SystemAccentColor}"
Command="{Binding InstallUpdateCommand}"
Visibility="{Binding IsUpdateDownloaded, Mode=OneWay, Converter={StaticResource VisibilityConverter}}">
<Button.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</Button.Resources>
</Button>
Command="{Binding CheckUpdateCommand}"
Visibility="{Binding IsUpdateAvailable, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}" />
</Grid>
<!-- Check for update -->
<!-- Check for update (store) -->
<Button
x:Uid="TextUpdateCheck"
MinWidth="100"
HorizontalAlignment="Right"
Command="{Binding CheckUpdateCommand}"
Visibility="{Binding IsUpdateAvailable, Mode=OneWay, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}" />
VerticalAlignment="Center"
Command="{Binding OpenStorePageCommand}"
Visibility="{Binding IsWinStore, Mode=OneWay, Converter={StaticResource VisibilityConverter}}" />
</Grid>
</controls:SettingsCard>
<ProgressBar
Expand Down

0 comments on commit 06ecd16

Please sign in to comment.