JSON Breaking change, Added style options!

1.2.0

Author: Firestack

UnityMultiLauncher/App.xaml.cs

@@ -19,12 +19,9 @@ protected override void OnStartup(StartupEventArgs e)
 
 			// get the current app style (theme and accent) from the application
 			// you can then use the current theme and custom accent instead set a new theme
-			Tuple<AppTheme, Accent> appStyle = ThemeManager.DetectAppStyle(Application.Current);
-
 			// now set the Green accent and dark theme
-			ThemeManager.ChangeAppStyle(Application.Current,
-										ThemeManager.GetAccent(ProgramConfig.conf.AccentColor),
-										ThemeManager.GetAppTheme("BaseLight")); // or appStyle.Item1
+			ThemeManager.ChangeAppStyle(Application.Current, ProgramConfig.conf.appStyle.Item2, ProgramConfig.conf.appStyle.Item1);
+
 
 			base.OnStartup(e);
 		}

UnityMultiLauncher/Models/ConfigLoader.cs

@@ -35,7 +35,7 @@ public static T LoadConfig<T>(string relPath) where T : Config
 
 		public static void SaveConfig(string relPath, object obj)
 		{
-			File.WriteAllText(relPath, JsonConvert.SerializeObject(obj));
+			File.WriteAllText(relPath, JsonConvert.SerializeObject(obj, Formatting.None, new JsonSerializerSettings { }));
 		}
 	}
 }

UnityMultiLauncher/Models/ProgramConfig.cs

@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Windows;
+using Newtonsoft.Json;
+using MahApps.Metro;
 
 namespace UnityMultiLauncher
 {
@@ -33,9 +35,27 @@ public class ProgramConfig : Utility.ConfigLoader.Config
 
 		public static string defaultFilename { get { return string.Format("unitymultilauncher.{0}.cfg.json", Environment.UserName); } }
 
-		
-		public HashSet<Uri> unityExeLocations = new HashSet<Uri>();
+		[JsonIgnore]
+		public Tuple<AppTheme, Accent> appStyle
+		{
+			get
+			{
+				return Tuple.Create(
+					ThemeManager.AppThemes.First(theme => theme.Name == appTheme), 
+					ThemeManager.Accents.First(accent => accent.Name == appAccent)
+				);
+			}
+			set
+			{
+				appTheme = value.Item1.Name;
+				appAccent = value.Item2.Name;
+			}
+		}
 
-		public string AccentColor = "Blue";
+		public string appTheme = "BaseLight";
+
+		public string appAccent = "Blue";
+
+		public HashSet<Uri> unityExeLocations = new HashSet<Uri>();
 	}
 }

UnityMultiLauncher/UnityMultiLauncher.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Models\ConfigLoader.cs" />
     <Compile Include="Models\ProgramConfig.cs" />
     <Compile Include="Models\Utility.cs" />
+    <Compile Include="ViewModels\StyleViewModel.cs" />
     <Compile Include="ViewModels\UnityViewModel.cs" />
     <Compile Include="ViewModels\Utils\ViewCommand.cs" />
     <Compile Include="ViewModels\Utils\ViewModel.cs" />
@@ -108,6 +109,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ViewModels\UtilViewModel.cs" />
     <Compile Include="Views\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>

UnityMultiLauncher/ViewModels/StyleViewModel.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using MahApps.Metro;
+using UnityMultiLauncher.ViewModels.Utils;
+
+namespace UnityMultiLauncher.ViewModels
+{
+	class StyleViewModel : ViewModel
+	{
+		public IEnumerable<string> appTheme
+		{
+			get
+			{
+				return ThemeManager.AppThemes.Select(theme => theme.Name);
+			}
+		}
+
+		public IEnumerable<string> appAccent
+		{
+			get
+			{
+				return ThemeManager.Accents.Select(accent => accent.Name);
+			}
+		}
+
+		public Tuple<AppTheme, Accent> cTheme
+		{
+			get
+			{
+				return ThemeManager.DetectAppStyle(Application.Current);
+			}
+			set
+			{
+				ThemeManager.ChangeAppStyle(Application.Current, value.Item2, value.Item1);
+				//ThemeManager.GetAccent(ProgramConfig.conf.AccentColor), ThemeManager.GetAppTheme("BaseLight")
+				ProgramConfig.conf.appStyle = value;
+				ProgramConfig.conf.Save();
+			}
+		}
+
+		public int appThemeSelected
+		{
+			get
+			{
+				return appTheme.ToList().IndexOf(cTheme.Item1.Name);
+			}
+			set
+			{
+				cTheme = Tuple.Create(
+					ThemeManager.GetAppTheme(appTheme.ToList()[value]),
+					ThemeManager.GetAccent(appAccent.ToList()[appAccentSelected])
+				);
+			}
+		}
+
+		public int appAccentSelected
+		{
+			get
+			{
+				return appAccent.ToList().IndexOf(cTheme.Item2.Name);
+			}
+			set
+			{
+				cTheme = Tuple.Create(
+					ThemeManager.GetAppTheme(appTheme.ToList()[appThemeSelected]), 
+					ThemeManager.GetAccent(appAccent.ToList()[value])
+				);
+			}
+		}
+	}
+}

UnityMultiLauncher/ViewModels/UtilViewModel.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityMultiLauncher.ViewModels.Utils;
+
+namespace UnityMultiLauncher.ViewModels
+{
+	public class UtilViewModel : Utils.ViewModel
+	{
+		protected void ToggleFlyout(object param)
+		{
+			if (param is MahApps.Metro.Controls.Flyout)
+			{
+				var fl = (param as MahApps.Metro.Controls.Flyout);
+				fl.IsOpen = !fl.IsOpen;
+			}
+
+		}
+
+
+		public Utils.ViewCommand OpenFlyout
+		{
+			get
+			{
+				return GetProperty() as ViewCommand ?? SetProperty(new ViewCommand(ToggleFlyout));
+			}
+		}
+	}
+}

UnityMultiLauncher/Views/MainWindow.xaml

@@ -11,15 +11,32 @@
 		Width="800" >
 	<Controls:MetroWindow.Resources>
 		<VM:UnityViewModel x:Key="unity"/>
+		<VM:UtilViewModel x:Key="util"/>
+		<VM:StyleViewModel x:Key="stylevm"></VM:StyleViewModel>
 		<Converter:UnityUriToUnityVersion x:Key="uriToVersion"/>
 	</Controls:MetroWindow.Resources>
 
 	<Controls:MetroWindow.RightWindowCommands>
 		<Controls:WindowCommands>
 			<Button Content="Add Unity Executable" Command="{Binding addUnityVersion, Mode=OneWay, Source={StaticResource unity}}" CommandParameter="{Binding ElementName=metroWindow, Mode=OneWay}" />
+			<Button Content="Settings" Command="{Binding Source={StaticResource util}, Path=OpenFlyout}" CommandParameter="{Binding ElementName=SettingsFlyout, Mode=OneWay}"></Button>
 		</Controls:WindowCommands>
 	</Controls:MetroWindow.RightWindowCommands>
 
+	<Controls:MetroWindow.Flyouts>
+		<Controls:FlyoutsControl>
+			<Controls:Flyout x:Name="SettingsFlyout" Header="Settings" Position="Right" IsOpen="False" HorizontalAlignment="Left" Margin="0" Padding="10,70,50,0" >
+				<StackPanel>
+					<Label>App Theme</Label>
+					<ComboBox ItemsSource="{Binding appTheme, Source={StaticResource stylevm}}" SelectedIndex="{Binding appThemeSelected, Source={StaticResource stylevm}}" ></ComboBox>
+					<Label>App Accent</Label>
+					<ComboBox ItemsSource="{Binding appAccent, Source={StaticResource stylevm}}" SelectedIndex="{Binding appAccentSelected, Source={StaticResource stylevm}}" ></ComboBox>
+				</StackPanel>
+
+			</Controls:Flyout>
+		</Controls:FlyoutsControl>
+	</Controls:MetroWindow.Flyouts>
+
 	<Grid>
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />