Starting work on Downloading versions

MinecraftZenova · Apr 13, 2020 · 539fab8 · 539fab8
1 parent a3c22ff
commit 539fab8
Show file tree

Hide file tree

Showing 36 changed files with 574 additions and 258 deletions.
diff --git a/ZenovaLauncher/App.xaml.cs b/ZenovaLauncher/App.xaml.cs
@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace ZenovaLauncher
@@ -20,14 +14,15 @@ public partial class App : Application
         private readonly string _directoryProfiles = "Profiles";
         private readonly string _directoryVersions = "Versions";
         private string _dataDirectory;
-        private EnvironmentVariableTarget _environmentType;
-
 
         public void AppStart(object sender, StartupEventArgs e)
         {
             SetupEnvironment();
-            VersionManager.instance = new VersionManager(Path.Combine(VersionsDirectory, "versions.json"));
+            VersionDownloader.standard = new VersionDownloader();
+            VersionDownloader.user = new VersionDownloader();
+            VersionManager.instance = new VersionManager(VersionsDirectory);
             ProfileManager.instance = new ProfileManager(ProfilesDirectory);
+            ProfileLauncher.instance = new ProfileLauncher();
             Preferences.LoadPreferences(DataDirectory);
             Dispatcher.Invoke(async () =>
             {
@@ -49,21 +44,18 @@ private void SetupEnvironment()
             if (value != null)
             {
                 _dataDirectory = value;
-                _environmentType = EnvironmentVariableTarget.User;
             }
             else
             {
                 value = Environment.GetEnvironmentVariable(_environmentKey, EnvironmentVariableTarget.Machine);
                 if (value != null)
                 {
                     _dataDirectory = value;
-                    _environmentType = EnvironmentVariableTarget.Machine;
                 }
                 else
                 {
                     // if not, create user environment variable at default location
                     Environment.SetEnvironmentVariable(_environmentKey, DataDirectory, EnvironmentVariableTarget.User);
-                    _environmentType = EnvironmentVariableTarget.User;
                 }
             }
         }

diff --git a/ZenovaLauncher/Controls/LauncherSideMenu.xaml b/ZenovaLauncher/Controls/LauncherSideMenu.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:ZenovaLauncher.Controls"
                     xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:ui="http://schemas.modernwpf.com/2019">
-
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="http://schemas.modernwpf.com/2019"
+                    xmlns:local="clr-namespace:ZenovaLauncher.Controls">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/ModernWpf;component/Styles/ListBox.xaml" />
     </ResourceDictionary.MergedDictionaries>

diff --git a/ZenovaLauncher/Controls/LauncherTabControl.cs b/ZenovaLauncher/Controls/LauncherTabControl.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

diff --git a/ZenovaLauncher/Dialogs/AddProfileDialog.xaml.cs b/ZenovaLauncher/Dialogs/AddProfileDialog.xaml.cs
@@ -1,19 +1,8 @@
-using System;
+using ModernWpf.Controls;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using ModernWpf.Controls;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/Dialogs/EditProfileDialog.xaml.cs b/ZenovaLauncher/Dialogs/EditProfileDialog.xaml.cs
@@ -1,19 +1,8 @@
-using System;
+using ModernWpf.Controls;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using ModernWpf.Controls;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/MainWindow.xaml b/ZenovaLauncher/MainWindow.xaml
@@ -71,7 +71,7 @@
                             <ui:SymbolIcon Symbol="Home" />
                         </mah:HamburgerMenuIconItem.Icon>
                     </mah:HamburgerMenuIconItem>
-                    
+
                     <mah:HamburgerMenuIconItem
                         Label="News"
                         Tag="Pages/NewsPage.xaml">

diff --git a/ZenovaLauncher/MainWindow.xaml.cs b/ZenovaLauncher/MainWindow.xaml.cs
@@ -1,18 +1,8 @@
 using MahApps.Metro.Controls;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/Pages/HelpPage.xaml.cs b/ZenovaLauncher/Pages/HelpPage.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/Pages/MainPage.xaml.cs b/ZenovaLauncher/Pages/MainPage.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/Pages/ModsPage.xaml.cs b/ZenovaLauncher/Pages/ModsPage.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ZenovaLauncher
 {
@@ -20,7 +7,8 @@ namespace ZenovaLauncher
     /// </summary>
     public partial class ModsPage : Page
     {
-        public ModsPage() {
+        public ModsPage()
+        {
             InitializeComponent();
         }
     }

diff --git a/ZenovaLauncher/Pages/NewsPage.xaml.cs b/ZenovaLauncher/Pages/NewsPage.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ZenovaLauncher
 {

diff --git a/ZenovaLauncher/Pages/PlayPage.xaml b/ZenovaLauncher/Pages/PlayPage.xaml
@@ -37,7 +37,7 @@
                     <BeginStoryboard>
                         <Storyboard>
                             <DoubleAnimation Storyboard.TargetProperty="RenderTransform.Y" From="-20" To="0" Duration="0:0:0.2" />
-                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0.1" To="1.0" Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0.0" To="1.0" Duration="0:0:0.2" />
                         </Storyboard>
                     </BeginStoryboard>
                 </EventTrigger>
@@ -51,11 +51,16 @@
             Content="Launch Minecraft"
             HorizontalAlignment="Center" 
             VerticalAlignment="Bottom" 
-            Width="200"
+            Width="240"
             Height="50"
             Margin="0,0,0,20"
-            Style="{DynamicResource AccentButtonStyle}" />
-        <Grid Grid.Row="1" Grid.ColumnSpan="3"  Background="#FF262626" />
+            ui:ControlHelper.CornerRadius="4"
+            FontWeight="Normal"
+            FontSize="14"
+            Style="{DynamicResource LauncherAccentButtonStyle}"
+            Click="PlayButtonClick"
+            IsEnabled="{Binding Path=IsNotDownloading}"/>
+        <Grid Grid.Row="1" Grid.ColumnSpan="3" Background="{DynamicResource LauncherControlPageBackgroundChromeMediumBrush}" />
         <Grid Grid.Row="1" Grid.Column="0">
             <ComboBox
                 Style="{StaticResource ProfileBoxStyle}"

diff --git a/ZenovaLauncher/Pages/PlayPage.xaml.cs b/ZenovaLauncher/Pages/PlayPage.xaml.cs
@@ -1,17 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ZenovaLauncher
 {
@@ -20,9 +8,16 @@ namespace ZenovaLauncher
     /// </summary>
     public partial class PlayPage : Page
     {
-        public PlayPage() {
+        public PlayPage()
+        {
             InitializeComponent();
             ProfileBox.ItemsSource = ProfileManager.instance;
+            DataContext = ProfileLauncher.instance;
+        }
+
+        private void PlayButtonClick(object sender, RoutedEventArgs e)
+        {
+            ProfileLauncher.instance.LaunchProfile(ProfileBox.SelectedItem as Profile);
         }
     }
 }
diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml b/ZenovaLauncher/Pages/ProfilesPage.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:ZenovaLauncher"
       xmlns:ui="http://schemas.modernwpf.com/2019"
+      xmlns:tz="http://schemas.abtsoftware.co.uk/transitionz"
       xmlns:comment="Comments"
       mc:Ignorable="d comment">
 
@@ -17,6 +18,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid Grid.Row="0" MaxWidth="900" Margin="15,10,15,12" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
@@ -94,7 +96,7 @@
                                             </ui:SimpleStackPanel>
                                         </ui:SimpleStackPanel>
                                         <ui:SimpleStackPanel x:Name="InteractButtons" Grid.Column="2" HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8" Visibility="Hidden">
-                                            <Button Content="Play" Style="{DynamicResource LauncherAccentButtonStyle}" />
+                                            <Button Content="Play" Style="{DynamicResource LauncherAccentButtonStyle}" Click="PlayButtonClick" />
                                             <Button Padding="5,5,6,6"  Style="{DynamicResource LauncherDefaultButtonStyle}">
                                                 <Button.Content>
                                                     <ui:SymbolIcon Symbol="More" />
@@ -125,6 +127,20 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
                 </Grid>
+                <Grid Grid.Row="2" HorizontalAlignment="Stretch" Background="{DynamicResource LauncherControlPageBackgroundChromeMediumBrush}">
+                    <ProgressBar
+                        x:Name="LoadingProgressBar"
+                        Margin="10,9,10,9"
+                        MinHeight="32"
+                        HorizontalAlignment="Stretch"
+                        ui:ControlHelper.CornerRadius="0"
+                        Background="{DynamicResource LauncherControlTransientLowBackgroundBrush}"
+                        Minimum="0"
+                        Maximum="{Binding Path=DownloadInfo.TotalSize}"
+                        local:ProgressBarSmoother.SmoothValue="{Binding Path=DownloadInfo.DownloadedBytes}"
+                        IsIndeterminate="{Binding Path=DownloadInfo.IsProgressIndeterminate}"
+                        Visibility="{Binding Path=IsDownloading, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                </Grid>
             </Grid>
         </ui:ScrollViewerEx>
     </Grid>

diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml.cs b/ZenovaLauncher/Pages/ProfilesPage.xaml.cs
@@ -2,17 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ZenovaLauncher
 {
@@ -21,8 +13,10 @@ namespace ZenovaLauncher
     /// </summary>
     public partial class ProfilesPage : Page
     {
-        public ProfilesPage() {
+        public ProfilesPage()
+        {
             InitializeComponent();
+            DataContext = ProfileLauncher.instance;
             ProfileListBox.ItemsSource = ProfileManager.instance;
             SortProfileBox.DataContext = Preferences.instance;
             ReleasesBox.DataContext = Preferences.instance;
@@ -74,6 +68,11 @@ private void ProfileSelected(object sender, MouseButtonEventArgs e)
             EditProfile((sender as FrameworkElement).DataContext as Profile);
         }
 
+        private void PlayButtonClick(object sender, RoutedEventArgs e)
+        {
+            ProfileLauncher.instance.LaunchProfile((sender as FrameworkElement).DataContext as Profile);
+        }
+
         private void SortChanged(object sender, SelectionChangedEventArgs e)
         {
             SortProfileList(Preferences.instance.ProfileSorting);
@@ -93,7 +92,7 @@ protected void FilterProfileList()
                 predicates.Add(Profile.betaFilter);
             if (Preferences.instance.EnableHistorical)
                 predicates.Add(Profile.historicalFilter);
-            if(ProfileListBox != null)
+            if (ProfileListBox != null)
                 ProfileListBox.Items.Filter = o => predicates.Any(predicate => predicate(o));
         }