ux: checking update at startup (#2438)

- When `Check4Update` is called automatically at startup, do not show the result.
- Instead, show a `New version available` button in main title bar
- Before `Check4Update` is called manually, clear the existed `NewVersion` data

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/App.axaml.cs

@@ -524,6 +524,9 @@ private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
         #region Check for Updates
         private void Check4Update(bool manually = false)
         {
+            if (_launcher != null)
+                _launcher.NewVersion = null;
+
             Task.Run(async () =>
             {
                 try
@@ -537,23 +540,20 @@ private void Check4Update(bool manually = false)
                     if (ver == null)
                         return;
 
-                    // Check if already up-to-date.
-                    if (!ver.IsNewVersion)
+                    if (manually)
                     {
-                        if (manually)
+                        if (ver.IsNewVersion)
+                            ShowSelfUpdateResult(ver);
+                        else
                             ShowSelfUpdateResult(new Models.AlreadyUpToDate());
-                        return;
                     }
-
-                    // Should not check ignored tag if this is called manually.
-                    if (!manually)
+                    else if (_launcher != null)
                     {
-                        var pref = ViewModels.Preferences.Instance;
-                        if (ver.TagName == pref.IgnoreUpdateTag)
+                        if (!ver.IsNewVersion || ver.TagName == ViewModels.Preferences.Instance.IgnoreUpdateTag)
                             return;
-                    }
 
-                    ShowSelfUpdateResult(ver);
+                        _launcher.NewVersion = ver;
+                    }
                 }
                 catch (Exception e)
                 {

src/Resources/Locales/en_US.axaml

@@ -580,6 +580,7 @@
   <x:String x:Key="Text.Launcher.Commands" xml:space="preserve">Commands</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
+  <x:String x:Key="Text.Launcher.NewVersion" xml:space="preserve">New Version Available</x:String>
   <x:String x:Key="Text.Launcher.OpenRepository" xml:space="preserve">Open Repositories</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Tabs</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -584,6 +584,7 @@
   <x:String x:Key="Text.Launcher.Commands" xml:space="preserve">命令列表</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
+  <x:String x:Key="Text.Launcher.NewVersion" xml:space="preserve">检测到新版本</x:String>
   <x:String x:Key="Text.Launcher.OpenRepository" xml:space="preserve">打开其他仓库</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">页面列表</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作区列表</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -584,6 +584,7 @@
   <x:String x:Key="Text.Launcher.Commands" xml:space="preserve">命令列表</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">發生錯誤</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
+  <x:String x:Key="Text.Launcher.NewVersion" xml:space="preserve">檢測到新版本</x:String>
   <x:String x:Key="Text.Launcher.OpenRepository" xml:space="preserve">開啟存放庫</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">頁面列表</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作區列表</x:String>

src/ViewModels/Launcher.cs

@@ -45,6 +45,12 @@ public ICommandPalette CommandPalette
             set => SetProperty(ref _commandPalette, value);
         }
 
+        public Models.Version NewVersion
+        {
+            get => _newVersion;
+            set => SetProperty(ref _newVersion, value);
+        }
+
         public Launcher(string startupRepo)
         {
             Models.Notification.Raised += DispatchNotification;
@@ -467,5 +473,6 @@ private void PostActivePageChanged()
         private bool _ignoreIndexChange;
         private string _title = string.Empty;
         private ICommandPalette _commandPalette;
+        private Models.Version _newVersion = null;
     }
 }

src/Views/Launcher.axaml

@@ -19,9 +19,9 @@
     </Grid.RowDefinitions>
 
     <!-- Custom TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,32,32,*,Auto">
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,32,32,*,Auto,Auto">
       <!-- Bottom border -->
-      <Border Grid.Column="0" Grid.ColumnSpan="5"
+      <Border Grid.Column="0" Grid.ColumnSpan="6"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               Background="{DynamicResource Brush.TitleBar}"
               DoubleTapped="MaximizeOrRestoreWindow"
@@ -111,8 +111,20 @@
       <!-- Pages Tabs -->
       <v:LauncherTabBar Grid.Column="3" Height="30" Margin="0,0,16,0" VerticalAlignment="Bottom"/>
 
+      <!-- Update Available Button -->
+      <Button Grid.Column="4"
+              Classes="icon_button"
+              Height="30"
+              Margin="0,0,4,0"
+              VerticalAlignment="Top"
+              IsVisible="{Binding NewVersion, Converter={x:Static ObjectConverters.IsNotNull}}"
+              Click="OnShowNewVersion"
+              ToolTip.Tip="{DynamicResource Text.Launcher.NewVersion}">
+        <Path Width="15" Height="15" Margin="0,4,0,0" Data="{StaticResource Icons.SoftwareUpdate}" Fill="{DynamicResource Brush.Accent}"/>
+      </Button>
+
       <!-- Caption Buttons (Windows/Linux) -->
-      <Border Grid.Column="4" Margin="16,0,0,0" IsVisible="{Binding #ThisControl.HasRightCaptionButton}">
+      <Border Grid.Column="5" IsVisible="{Binding #ThisControl.HasRightCaptionButton}">
         <v:CaptionButtons Height="30" VerticalAlignment="Top"/>
       </Border>
     </Grid>

src/Views/Launcher.axaml.cs

@@ -423,6 +423,20 @@ private void OnCloseCommandPalette(object sender, PointerPressedEventArgs e)
             e.Handled = true;
         }
 
+        private async void OnShowNewVersion(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Launcher { NewVersion: { } ver } vm)
+            {
+                vm.NewVersion = null;
+
+                var ctx = new ViewModels.SelfUpdate { Data = ver };
+                var dialog = new SelfUpdate() { DataContext = ctx };
+                await dialog.ShowDialog(this);
+            }
+
+            e.Handled = true;
+        }
+
         private GridLength _captionHeight = new(32);
         private WindowState _lastWindowState = WindowState.Normal;
     }