change version window ui (#181)

Author: vinaghost

MainCore/Helper/GithubHelper.cs

@@ -30,18 +30,5 @@ public static async Task<Version> CheckGitHubLatestVersion()
             }
             return null;
         }
-
-        public static async Task<Version> CheckGitHublatestBuild()
-        {
-            try
-            {
-                var releases = await _client.Repository.Release.GetAll(_username, _repo);
-                if (releases.Count > 0) return new Version(releases[0].TagName);
-            }
-            catch
-            {
-            }
-            return null;
-        }
     }
 }

WPFUI/ViewModels/VersionViewModel.cs

@@ -18,16 +18,14 @@ public VersionViewModel()
 
             DiscordCommand = ReactiveCommand.Create(DiscordTask);
             LatestVersionCommand = ReactiveCommand.Create(LatestVersionTask, this.WhenAnyValue(x => x.IsNewVersion));
-            LatestBuildCommand = ReactiveCommand.Create(LatestBuildTask, this.WhenAnyValue(x => x.IsNewBuild));
             CloseCommand = ReactiveCommand.Create(CloseTask);
         }
 
         public async Task Load()
         {
-            var result = await Task.WhenAll(GithubHelper.CheckGitHubLatestVersion(), GithubHelper.CheckGitHublatestBuild());
+            var result = await GithubHelper.CheckGitHubLatestVersion();
 
-            LatestVersion = result[0].ToString();
-            LatestBuild = result[1].ToString();
+            LatestVersion = result.ToString();
         }
 
         private void DiscordTask()
@@ -49,16 +47,6 @@ private void LatestVersionTask()
             CloseTask();
         }
 
-        private void LatestBuildTask()
-        {
-            Process.Start(new ProcessStartInfo
-            {
-                FileName = GithubHelper.GetLink(_latestBuild),
-                UseShellExecute = true
-            });
-            CloseTask();
-        }
-
         private void CloseTask()
         {
             CloseWindow?.Invoke();
@@ -68,7 +56,7 @@ private void CloseTask()
 
         public string CurrentVersion
         {
-            get => $"Current: {_currentVersion}";
+            get => $"Current version: {_currentVersion}";
             set => this.RaiseAndSetIfChanged(ref _currentVersion, value);
         }
 
@@ -85,18 +73,6 @@ public string LatestVersion
             }
         }
 
-        private string _latestBuild;
-
-        public string LatestBuild
-        {
-            get => $"Latest build: {_latestBuild}";
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _latestBuild, value);
-                this.RaisePropertyChanged(nameof(IsNewBuild));
-            }
-        }
-
         public bool IsNewVersion
         {
             get
@@ -107,16 +83,6 @@ public bool IsNewVersion
             }
         }
 
-        public bool IsNewBuild
-        {
-            get
-            {
-                var current = new Version($"{_currentVersion}.0");
-                var last = new Version($"{_latestVersion}.0");
-                return current.CompareTo(last) < 0;
-            }
-        }
-
         public string Message
         {
             get => message[IsNewVersion ? 1 : 0];
@@ -131,7 +97,6 @@ public string Message
 
         public ReactiveCommand<Unit, Unit> DiscordCommand { get; }
         public ReactiveCommand<Unit, Unit> LatestVersionCommand { get; }
-        public ReactiveCommand<Unit, Unit> LatestBuildCommand { get; }
         public ReactiveCommand<Unit, Unit> CloseCommand { get; }
 
         public event Action CloseWindow;

WPFUI/Views/VersionWindow.xaml

@@ -13,7 +13,6 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
             <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="2*" />
@@ -31,15 +30,8 @@
         <Border x:Name="LastVersionBorder" BorderBrush="Black" BorderThickness="1" Grid.Column="1" Margin="20,10,20,0" Grid.Row="2">
             <TextBlock x:Name="LastVersionLabel" HorizontalAlignment="Center" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Center" />
         </Border>
-        <Border x:Name="LastBuildBorder" BorderBrush="Black" BorderThickness="1" Grid.Column="2" Margin="20,10,20,0" Grid.Row="2">
-            <TextBlock x:Name="LastBuildLabel" HorizontalAlignment="Center" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Center" />
-        </Border>
-        <Border x:Name="NoteBorder" BorderBrush="Black" BorderThickness="1" Grid.ColumnSpan="3" Margin="20,5,20,5" Grid.Row="3">
-            <TextBlock x:Name="NoteLabel" HorizontalAlignment="Center" TextWrapping="Wrap" Text="Latest version is stable (we hope) while latest build is unstable and maybe for tester only" VerticalAlignment="Center" />
-        </Border>
         <Button x:Name="DiscordButton" Content="Discord" HorizontalAlignment="Stretch" Margin="20,0,20,0" Grid.Row="1" VerticalAlignment="Stretch" />
         <Button x:Name="LastVersionButton" Grid.Column="1" Content="Download latest version" HorizontalAlignment="Stretch" Margin="20,0,20,0" Grid.Row="1" VerticalAlignment="Stretch" />
-        <Button x:Name="LastBuildButton" Grid.Column="2" Content="Download latest build" HorizontalAlignment="Stretch" Margin="20,0,20,0" Grid.Row="1" VerticalAlignment="Stretch" />
         <Button x:Name="CloseButton" Content="Close" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="20,0,20,10" Grid.Row="4" VerticalAlignment="Stretch" />
     </Grid>
 </reactiveui:ReactiveWindow>

WPFUI/Views/VersionWindow.xaml.cs

@@ -19,13 +19,11 @@ public VersionWindow()
             {
                 this.BindCommand(ViewModel, vm => vm.DiscordCommand, v => v.DiscordButton).DisposeWith(d);
                 this.BindCommand(ViewModel, vm => vm.LatestVersionCommand, v => v.LastVersionButton).DisposeWith(d);
-                this.BindCommand(ViewModel, vm => vm.LatestBuildCommand, v => v.LastBuildButton).DisposeWith(d);
                 this.BindCommand(ViewModel, vm => vm.CloseCommand, v => v.CloseButton).DisposeWith(d);
 
                 this.OneWayBind(ViewModel, vm => vm.Message, v => v.StatusLabel.Text).DisposeWith(d);
                 this.OneWayBind(ViewModel, vm => vm.CurrentVersion, v => v.CurrentLabel.Text).DisposeWith(d);
                 this.OneWayBind(ViewModel, vm => vm.LatestVersion, v => v.LastVersionLabel.Text).DisposeWith(d);
-                this.OneWayBind(ViewModel, vm => vm.LatestBuild, v => v.LastBuildLabel.Text).DisposeWith(d);
             });
         }
     }