Implement About Page

MinecraftZenova · Jun 9, 2020 · d474845 · d474845
1 parent 2d4aa24
commit d474845
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 9 deletions.
diff --git a/ZenovaLauncher/Pages/ModsPage.xaml b/ZenovaLauncher/Pages/ModsPage.xaml
@@ -88,7 +88,7 @@
                                         <ui:SimpleStackPanel Grid.Column="0" HorizontalAlignment="Left" Orientation="Horizontal">
                                             <ui:SimpleStackPanel>
                                                 <TextBlock FontWeight="Bold" FontSize="16" Text="{Binding Name}" />
-                                                <TextBlock FontSize="12" Text="{Binding Description}" />
+                                                <TextBlock FontSize="12" Text="{Binding Description}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
                                             </ui:SimpleStackPanel>
                                         </ui:SimpleStackPanel>
                                         <ui:SimpleStackPanel x:Name="InteractButtons" Grid.Column="2" HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8" Visibility="Hidden">

diff --git a/ZenovaLauncher/Pages/PlayPage.xaml b/ZenovaLauncher/Pages/PlayPage.xaml
@@ -160,7 +160,7 @@
                     <DataTemplate>
                         <ui:SimpleStackPanel Spacing="4">
                             <TextBlock FontWeight="Bold" FontSize="14" Text="{Binding Path=Name}" />
-                            <TextBlock FontSize="10" Text="{Binding Path=VersionName}" />
+                            <TextBlock FontSize="10" Text="{Binding Path=VersionName}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
                         </ui:SimpleStackPanel>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>

diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml b/ZenovaLauncher/Pages/ProfilesPage.xaml
@@ -97,7 +97,7 @@
                                         <ui:SimpleStackPanel Grid.Column="0" HorizontalAlignment="Left" Orientation="Horizontal">
                                             <ui:SimpleStackPanel>
                                                 <TextBlock FontWeight="Bold" FontSize="16" Text="{Binding Path=Name}" />
-                                                <TextBlock FontSize="12" Text="{Binding Path=VersionName}" />
+                                                <TextBlock FontSize="12" Text="{Binding Path=VersionName}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
                                             </ui:SimpleStackPanel>
                                         </ui:SimpleStackPanel>
                                         <ui:SimpleStackPanel x:Name="InteractButtons" Grid.Column="2" HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8" Visibility="Hidden">

diff --git a/ZenovaLauncher/Pages/SettingsPage.xaml b/ZenovaLauncher/Pages/SettingsPage.xaml
@@ -43,7 +43,28 @@
                 <TextBlock Text="Accounts Settings" />
             </control:MyTabItem>
             <control:MyTabItem Header="About">
-                <TextBlock Text="About Launcher" />
+                <Grid Margin="63,21,63,0">
+                    <ItemsControl x:Name="AboutPanel" HorizontalAlignment="Stretch">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Height="118">
+                                    <Separator x:Name="Separator" VerticalAlignment="Top" Background="{DynamicResource AppBarSeparatorLowForeground}" />
+                                    <ui:SimpleStackPanel Spacing="4" VerticalAlignment="Center">
+                                        <TextBlock FontSize="17" FontWeight="Bold" Text="{Binding Path=RepositoryName}" />
+                                        <TextBlock FontSize="12" Text="{Binding Path=InstalledVersionString}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
+                                        <TextBlock FontSize="12" Text="{Binding Path=PublishDateString}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
+                                        <TextBlock FontSize="12" Text="{Binding Path=CommitHashString}" Foreground="{DynamicResource SystemControlPageTextBaseMediumBrush}" />
+                                    </ui:SimpleStackPanel>
+                                </Grid>
+                                <DataTemplate.Triggers>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">
+                                        <Setter Property="Visibility" TargetName="Separator" Value="Collapsed"/>
+                                    </DataTrigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </Grid>
             </control:MyTabItem>
         </control:LauncherTabControl>
     </Grid>

diff --git a/ZenovaLauncher/Pages/SettingsPage.xaml.cs b/ZenovaLauncher/Pages/SettingsPage.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Collections.ObjectModel;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace ZenovaLauncher
@@ -8,6 +9,8 @@ namespace ZenovaLauncher
     /// </summary>
     public partial class SettingsPage : Page
     {
+        private ObservableCollection<ZenovaUpdater.AssemblyType> Assemblies = new ObservableCollection<ZenovaUpdater.AssemblyType>();
+
         public SettingsPage()
         {
             InitializeComponent();
@@ -16,6 +19,12 @@ public SettingsPage()
             FreeSpaceBox.DataContext = Preferences.instance;
             DebugBox.DataContext = Preferences.instance;
             UpdateBox.DataContext = Preferences.instance;
+
+            Assemblies.Add(ZenovaUpdater.InstallerAssembly);
+            Assemblies.Add(ZenovaUpdater.ApiAssembly);
+            Assemblies.Add(ZenovaUpdater.LoaderAssembly);
+
+            AboutPanel.ItemsSource = Assemblies;
         }
 
         private void FreeSpaceClick(object sender, RoutedEventArgs e)

diff --git a/ZenovaLauncher/Properties/AssemblyInfo.cs b/ZenovaLauncher/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.2")]
-[assembly: AssemblyFileVersion("1.0.1.2")]
+[assembly: AssemblyVersion("1.0.1.3")]
+[assembly: AssemblyFileVersion("1.0.1.3")]
diff --git a/ZenovaLauncher/Utils/ZenovaUpdater.cs b/ZenovaLauncher/Utils/ZenovaUpdater.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Threading;
@@ -118,8 +119,8 @@ public async Task<bool> CheckUpdate(AssemblyType type)
         {
             try
             {
-                var releases = await Client.Repository.Release.GetAll("MinecraftZenova", type.RepositoryName);
-                type.LatestRelease = releases[0];
+                type.LatestRelease = await Client.Repository.Release.GetLatest("MinecraftZenova", type.RepositoryName);
+                type.TagInfo = (await Client.Repository.GetAllTags("MinecraftZenova", type.RepositoryName)).FirstOrDefault(x => x.Name == type.LatestRelease.TagName);
 
                 if (type.InstalledVersion == null)
                     return true;
@@ -206,6 +207,7 @@ public class AssemblyType
             private Version _installedVersion;
             public string RepositoryName { get; set; }
             public Release LatestRelease { get; set; }
+            public RepositoryTag TagInfo { get; set; }
             public GetDLPath DownloadPath { get; set; }
             public PostDownload PostDownloadTask { get; set; }
             public Version InstalledVersion
@@ -234,6 +236,10 @@ private static Version GetVersionFromPath(string path)
                 }
                 return null;
             }
+
+            public string InstalledVersionString => InstalledVersion.ToString();
+            public string PublishDateString => LatestRelease?.PublishedAt.Value.DateTime.ToString("dddd, MMMM dd, yyyy, HH:mm:ss");
+            public string CommitHashString => TagInfo.Commit.Sha;
         }
     }
 }