moved webSocket to App, tried to use NamedPipe between SystemTray and App, but cannot connect

.gitignore

@@ -2,7 +2,6 @@
 FluentTerminal.App/Win32
 FluentTerminal.App/Client/
 FluentTerminal.Client/dist
-/.sonarqube
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

Explorer Context Menu Integration/Install.bat

@@ -1,3 +1,3 @@
-reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%1\"" /f
-reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
-reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%1" /f
+reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%V" /f
+reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%V" /f

FluentTerminal.App.Services.Test/DefaultValueProviderTests.cs

@@ -1,157 +0,0 @@
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.Models.Enums;
-using System.Collections.Generic;
-using System.Linq;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class DefaultValueProviderTests
-    {
-        public static IEnumerable<object[]> Commands => System.Enum.GetValues(typeof(Command)).Cast<Command>().Select(x => new object[] { x });
-
-        [Fact]
-        public void GetDefaultApplicationSettings_Default_DoesNotReturnNull()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var applicationSettings = defaultValueProvider.GetDefaultApplicationSettings();
-
-            applicationSettings.Should().NotBeNull();
-        }
-
-        [Theory]
-        [MemberData(nameof(Commands))]
-        public void GetDefaultKeyBindings_AllCommands_ReturnsANonEmptyList(Command command)
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var keyBindings = defaultValueProvider.GetDefaultKeyBindings(command);
-
-            keyBindings.Should().NotBeNullOrEmpty();
-        }
-
-        [Fact]
-        public void GetDefaultShellProfileId_Default_DoesNotReturnEmptyGuid()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var defaultShellProfileId = defaultValueProvider.GetDefaultShellProfileId();
-
-            defaultShellProfileId.Should().NotBeEmpty();
-        }
-
-        [Fact]
-        public void GetDefaultShellProfileId_Default_IdIsOneOfThePreInstalledShellProfiles()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
-
-            var defaultShellProfileId = defaultValueProvider.GetDefaultShellProfileId();
-
-            shellProfiles.Select(x => x.Id).Should().Contain(defaultShellProfileId);
-        }
-
-        [Fact]
-        public void GetDefaultTerminalOptions_Default_DoesNotReturnNull()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var defaultTerminalOptions = defaultValueProvider.GetDefaultTerminalOptions();
-
-            defaultTerminalOptions.Should().NotBeNull();
-        }
-
-        [Fact]
-        public void GetDefaultThemeId_Default_DoesNotReturnEmptyGuid()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var defaultThemeId = defaultValueProvider.GetDefaultThemeId();
-
-            defaultThemeId.Should().NotBeEmpty();
-        }
-
-        [Fact]
-        public void GetDefaultThemeId_Default_IdIsOneOfThePreInstalledThemes()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-            var themes = defaultValueProvider.GetPreInstalledThemes();
-
-            var defaultThemeId = defaultValueProvider.GetDefaultThemeId();
-
-            themes.Select(x => x.Id).Should().Contain(defaultThemeId);
-        }
-
-        [Fact]
-        public void GetPreinstalledShellProfiles_Default_ReturnsANonEmptyList()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
-
-            shellProfiles.Should().NotBeNullOrEmpty();
-        }
-
-        [Fact]
-        public void GetPreinstalledShellProfiles_Default_HaveUniqueIds()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
-
-            shellProfiles.Select(x => x.Id).Should().OnlyHaveUniqueItems();
-        }
-
-        [Fact]
-        public void GetPreinstalledShellProfiles_Default_HavePreInstalledSetToTrue()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
-
-            shellProfiles.Select(x => x.PreInstalled).Should().AllBeEquivalentTo(true);
-        }
-
-        [Fact]
-        public void GetPreinstalledShellProfiles_Default_HaveNonEmptyLocations()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
-
-            shellProfiles.Select(x => x.Location).Should().NotBeNullOrEmpty();
-        }
-
-        [Fact]
-        public void GetPreInstalledThemes_Default_ReturnsANonEmptyList()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var themes = defaultValueProvider.GetPreInstalledThemes();
-
-            themes.Should().NotBeNullOrEmpty();
-        }
-
-        [Fact]
-        public void GetPreinstalledThemes_Default_HaveUniqueIds()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var themes = defaultValueProvider.GetPreInstalledThemes();
-
-            themes.Select(x => x.Id).Should().OnlyHaveUniqueItems();
-        }
-
-        [Fact]
-        public void GetPreinstalledThemes_Default_HavePreInstalledSetToTrue()
-        {
-            var defaultValueProvider = new DefaultValueProvider();
-
-            var themes = defaultValueProvider.GetPreInstalledThemes();
-
-            themes.Select(x => x.PreInstalled).Should().AllBeEquivalentTo(true);
-        }
-    }
-}

FluentTerminal.App.Services.Test/DialogServiceTests.cs

@@ -1,11 +1,11 @@
-using AutoFixture;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoFixture;
 using FluentAssertions;
 using FluentTerminal.App.Services.Dialogs;
 using FluentTerminal.App.Services.Implementation;
 using Moq;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace FluentTerminal.App.Services.Test
@@ -20,90 +20,41 @@ namespace FluentTerminal.App.Services.Test
         }
 
         [Fact]
-        public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
-        {
-            var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
-
-            dialogService.ShowCreateKeyBindingDialog();
-
-            createKeyBindingDialog.Verify(x => x.CreateKeyBinding(), Times.Once);
-        }
-
-        [Fact]
-        public void ShowMessageDialogAsnyc_TitleIsEmpty_ThrowsArgumentNullException()
+        public void ShowDialogAsync_TitleIsEmpty_ThrowsArgumentNullException()
         {
             var title = string.Empty;
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
+            var dialogService = new DialogService(() => Mock.Of<IShellProfileSelectionDialog>(), () => Mock.Of<IMessageDialog>(), () => Mock.Of<ICreateKeyBindingDialog>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
+            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
         }
 
         [Fact]
-        public void ShowMessageDialogAsnyc_ContentIsEmpty_ThrowsArgumentNullException()
+        public void ShowDialogAsync_ContentIsEmpty_ThrowsArgumentNullException()
         {
             var title = _fixture.Create<string>();
             var content = string.Empty;
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
+            var dialogService = new DialogService(() => Mock.Of<IShellProfileSelectionDialog>(), () => Mock.Of<IMessageDialog>(), () => Mock.Of<ICreateKeyBindingDialog>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
+            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
         }
 
         [Fact]
-        public void ShowMessageDialogAsnyc_NoButtonsPassed_ThrowsArgumentException()
+        public void ShowDialogAsync_NoButtonsPassed_ThrowsArgumentException()
         {
             var title = _fixture.Create<string>();
             var content = _fixture.Create<string>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
+            var dialogService = new DialogService(() => Mock.Of<IShellProfileSelectionDialog>(), () => Mock.Of<IMessageDialog>(), () => Mock.Of<ICreateKeyBindingDialog>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
-            showMessageDialogAsnyc.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
-        }
-
-        [Fact]
-        public void ShowMessageDialogAsnyc_Default_UsesMessageDialog()
-        {
-            var title = _fixture.Create<string>();
-            var content = _fixture.Create<string>();
-            var buttons = _fixture.CreateMany<DialogButton>(2);
-            var messageDialog = new Mock<IMessageDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
-
-            dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
-
-            messageDialog.Verify(x => x.ShowAsync(), Times.Once);
-        }
-
-        [Fact]
-        public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
-        {
-            var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
-            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
-
-            dialogService.ShowProfileSelectionDialogAsync();
-
-            shellProfileSelectionDialog.Verify(x => x.SelectProfile(), Times.Once);
-        }
-        
-        [Fact]
-        public void ShowInputDialogAsync_UsesIInputDialogSetTitle()
-        {
-            var title = "title";
-            var inputDialog = new Mock<IInputDialog>();            
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>);
-
-            dialogService.ShowInputDialogAsync(title);
-
-            inputDialog.Verify(x => x.SetTitle(title), Times.Once);
-            inputDialog.Verify(x => x.GetInput(), Times.Once);
+            invoke.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
         }
     }
 }

FluentTerminal.App.Services.Test/FluentTerminal.App.Services.Test.csproj

@@ -7,29 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="TestData\AdventureTime.itermcolors" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.8.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="AutoFixture" Version="4.4.0" />
+    <PackageReference Include="FluentAssertions" Version="5.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="Moq" Version="4.8.3" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="TestData\AdventureTime.itermcolors">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\FluentTerminal.App.Services\FluentTerminal.App.Services.csproj" />
   </ItemGroup>

FluentTerminal.App.Services.Test/FluentTerminalThemeParserTests.cs

@@ -1,80 +0,0 @@
-using AutoFixture;
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.Models;
-using Newtonsoft.Json;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class FluentTerminalThemeParserTests
-    {
-        private readonly Fixture _fixture;
-
-        public FluentTerminalThemeParserTests()
-        {
-            _fixture = new Fixture();
-        }
-
-        [Fact]
-        public async Task Parse_ValidFileStream_ReturnsTheme()
-        {
-            var theme = _fixture.Create<TerminalTheme>();
-            var serialized = JsonConvert.SerializeObject(theme);
-            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
-            var parser = new FluentTerminalThemeParser();
-
-            var parsedTheme = await parser.Parse(theme.Name, stream);
-
-            parsedTheme.Name.Should().Be(theme.Name);
-            parsedTheme.Author.Should().Be(theme.Author);
-            parsedTheme.PreInstalled.Should().Be(false);
-            parsedTheme.Colors.Should().BeEquivalentTo(theme.Colors);
-        }
-
-        [Fact]
-        public void Parse_InvalidFileStream_ThrowsException()
-        {
-            var fileName = _fixture.Create<string>();
-            var serialized = _fixture.Create<string>();
-            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
-            var parser = new FluentTerminalThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<Exception>();
-        }
-
-        [Theory]
-        [InlineData(null)]
-        [InlineData("")]
-        [InlineData(" ")]
-        public void Parse_InvalidFileName_ThrowsArgumentNullException(string fileName)
-        {
-            var theme = _fixture.Create<TerminalTheme>();
-            var serialized = JsonConvert.SerializeObject(theme);
-            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
-            var parser = new FluentTerminalThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileName");
-        }
-
-        [Fact]
-        public void Parse_FileStreamIsNull_ThrowsArgumentNullException()
-        {
-            var fileName = _fixture.Create<string>();
-            Stream stream = null;
-            var parser = new FluentTerminalThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileContent");
-        }
-    }
-}

FluentTerminal.App.Services.Test/ITermThemeParserTests.cs

@@ -1,91 +0,0 @@
-using AutoFixture;
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.Models;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class ITermThemeParserTests
-    {
-        private readonly Fixture _fixture;
-
-        public ITermThemeParserTests()
-        {
-            _fixture = new Fixture();
-        }
-
-        [Theory]
-        [InlineData(null)]
-        [InlineData("")]
-        [InlineData(" ")]
-        public void Parse_InvalidFileName_ThrowsArgumentNullException(string fileName)
-        {
-            var stream = typeof(ITermThemeParserTests).Assembly.GetManifestResourceStream("FluentTerminal.App.Services.Test.TestData.AdventureTime.itermcolors");
-            var parser = new ITermThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileName");
-        }
-
-        [Fact]
-        public void Parse_FileStreamIsNull_ThrowsArgumentNullException()
-        {
-            var fileName = _fixture.Create<string>();
-            Stream stream = null;
-            var parser = new ITermThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileContent");
-        }
-
-        [Fact]
-        public void Parse_InvalidFileStream_ThrowsException()
-        {
-            var fileName = _fixture.Create<string>();
-            var serialized = _fixture.Create<string>();
-            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
-            var parser = new ITermThemeParser();
-
-            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
-
-            parse.Should().Throw<Exception>();
-        }
-
-        [Fact]
-        public async Task Parse_ValidThemeFile_ParsesCorrectly()
-        {
-            var fileName = _fixture.Create<string>();
-            var stream = typeof(ITermThemeParserTests).Assembly.GetManifestResourceStream("FluentTerminal.App.Services.Test.TestData.AdventureTime.itermcolors");
-            var parser = new ITermThemeParser();
-
-            var theme = await parser.Parse(fileName, stream);
-
-            theme.Colors.Background.ToLower().Should().Be("#1f1d45");
-            theme.Colors.Cursor.ToLower().Should().Be("#efbf38");
-            theme.Colors.Foreground.ToLower().Should().Be("#f8dcc0");
-            theme.Colors.Black.ToLower().Should().Be("#050404");
-            theme.Colors.Red.ToLower().Should().Be("#bd0013");
-            theme.Colors.Green.ToLower().Should().Be("#4ab118");
-            theme.Colors.Yellow.ToLower().Should().Be("#e7741e");
-            theme.Colors.Blue.ToLower().Should().Be("#0f4ac6");
-            theme.Colors.Magenta.ToLower().Should().Be("#665993");
-            theme.Colors.Cyan.ToLower().Should().Be("#70a598");
-            theme.Colors.White.ToLower().Should().Be("#f8dcc0");
-            theme.Colors.BrightBlack.ToLower().Should().Be("#4e7cbf");
-            theme.Colors.BrightRed.ToLower().Should().Be("#fc5f5a");
-            theme.Colors.BrightGreen.ToLower().Should().Be("#9eff6e");
-            theme.Colors.BrightYellow.ToLower().Should().Be("#efc11a");
-            theme.Colors.BrightBlue.ToLower().Should().Be("#1997c6");
-            theme.Colors.BrightMagenta.ToLower().Should().Be("#9b5953");
-            theme.Colors.BrightCyan.ToLower().Should().Be("#c8faf4");
-            theme.Colors.BrightWhite.ToLower().Should().Be("#f6f5fb");
-        }
-    }
-}

FluentTerminal.App.Services.Test/KeyboardCommandServiceTests.cs

@@ -20,7 +20,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void RegisterCommandHandler_HandlerIsNull_ThrowsArgumentNullException()
         {
-            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
             Action handler = null;
             var keyboardCommandService = new KeyboardCommandService();
 
@@ -32,7 +32,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void RegisterCommandHandler_CommandAlreadyRegisted_ThrowsInvalidOperationException()
         {
-            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
             var handler = _fixture.Create<Action>();
             var keyboardCommandService = new KeyboardCommandService();
             keyboardCommandService.RegisterCommandHandler(command, handler);
@@ -45,7 +45,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void SendCommand_CommandIsRegistered_HandlerGetsInvoked()
         {
-            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
             var handlerCalled = false;
             var keyboardCommandService = new KeyboardCommandService();
             keyboardCommandService.RegisterCommandHandler(command, () => handlerCalled = true);
@@ -58,23 +58,12 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void SendCommand_CommandIsNotRegisted_KeyNotFoundExceptionIsThrown()
         {
-            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
             var keyboardCommandService = new KeyboardCommandService();
 
             Action invoke = () => keyboardCommandService.SendCommand(command);
 
             invoke.Should().Throw<KeyNotFoundException>();
         }
-        
-        [Fact]
-        public void SendCommand_CommandIsToggleWindow_ShouldNotThrow()
-        {
-            var command = nameof(Command.ToggleWindow);
-            var keyboardCommandService = new KeyboardCommandService();
-
-            Action invoke = () => keyboardCommandService.SendCommand(command);
-
-            invoke.Should().NotThrow();
-        }
     }
 }

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -1,758 +0,0 @@
-using AutoFixture;
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Moq;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class SettingsServiceTests
-    {
-        private readonly Fixture _fixture;
-
-        public SettingsServiceTests()
-        {
-            _fixture = new Fixture();
-        }
-
-        [Fact]
-        public void Constructor_Default_WritesAllPreinstalledThemesInThemeContainer()
-        {
-            var themes = _fixture.CreateMany<TerminalTheme>(3);
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            defaultValueProvider.Setup(x => x.GetPreInstalledThemes()).Returns(themes);
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-
-            new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            defaultValueProvider.Verify(x => x.GetPreInstalledThemes(), Times.Once);
-            foreach (var theme in themes)
-            {
-                themesContainer.Verify(x => x.WriteValueAsJson(theme.Id.ToString(), theme), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Constructor_Default_WritesAllPreinstalledShellProfilesInShellProfilesContainer()
-        {
-            var shellProfiles = _fixture.CreateMany<ShellProfile>(3);
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            defaultValueProvider.Setup(x => x.GetPreinstalledShellProfiles()).Returns(shellProfiles);
-            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = shellProfilesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-
-            new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            defaultValueProvider.Verify(x => x.GetPreinstalledShellProfiles(), Times.Once);
-            foreach (var shellProfile in shellProfiles)
-            {
-                shellProfilesContainer.Verify(x => x.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void GetCurrentThemeId_ValueExistsInRoamingSettings_ReturnsCurrentThemeId()
-        {
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var currentThemeId = (object)_fixture.Create<Guid>();
-            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetCurrentThemeId();
-
-            result.Should().Be((Guid)currentThemeId);
-            roamingSettings.Verify(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId), Times.Once);
-        }
-
-        [Fact]
-        public void GetCurrentThemeId_ValueDoesNotExistInRoamingSettings_ReturnsDefaultThemeIdFromDefaultValueProvider()
-        {
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            var defaultThemeId = _fixture.Create<Guid>();
-            defaultValueProvider.Setup(x => x.GetDefaultThemeId()).Returns(defaultThemeId);
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var currentThemeId = (object)_fixture.Create<Guid>();
-            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(false);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            var result = settingsService.GetCurrentThemeId();
-
-            result.Should().Be(defaultThemeId);
-            defaultValueProvider.Verify(x => x.GetDefaultThemeId(), Times.Once);
-            roamingSettings.Verify(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId), Times.Once);
-        }
-
-        [Fact]
-        public void SaveCurrentThemeId_Default_SetsValueOnRoamingSettings()
-        {
-            var currentThemeId = _fixture.Create<Guid>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveCurrentThemeId(currentThemeId);
-
-            roamingSettings.Verify(x => x.SetValue(SettingsService.CurrentThemeKey, currentThemeId), Times.Once);
-        }
-
-        [Fact]
-        public void SaveCurrentThemeId_Default_InvokesCurrentThemeChangedEvent()
-        {
-            var currentThemeId = _fixture.Create<Guid>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var currentThemeChangedEventInvoked = false;
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
-
-            settingsService.SaveCurrentThemeId(currentThemeId);
-
-            currentThemeChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void SaveTheme_Default_WritesToThemesContainer()
-        {
-            var theme = _fixture.Create<TerminalTheme>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveTheme(theme);
-
-            themesContainer.Verify(x => x.WriteValueAsJson(theme.Id.ToString(), theme), Times.Once);
-        }
-
-        [Fact]
-        public void SaveTheme_ThemeIsCurrentTheme_InvokesCurrentThemeChangedEvent()
-        {
-            var theme = _fixture.Create<TerminalTheme>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var currentThemeId = (object)theme.Id;
-            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
-            var currentThemeChangedEventInvoked = false;
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = roamingSettings.Object,
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
-
-            settingsService.SaveTheme(theme);
-
-            currentThemeChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void DeleteTheme_Default_CallsDeleteOnThemesContainer()
-        {
-            var themeId = _fixture.Create<Guid>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.DeleteTheme(themeId);
-
-            themesContainer.Verify(x => x.Delete(themeId.ToString()), Times.Once);
-        }
-
-        [Fact]
-        public void GetThemes_Default_CallsGetAllOnThemesContainer()
-        {
-            var themes = _fixture.CreateMany<TerminalTheme>(3);
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            themesContainer.Setup(x => x.GetAll()).Returns(themes.Select(JsonConvert.SerializeObject));
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetThemes();
-
-            result.Should().BeEquivalentTo(themes);
-            themesContainer.Verify(x => x.GetAll(), Times.Once);
-        }
-
-        [Fact]
-        public void GetTheme_ValidThemeId_ReturnsThemeFromThemesContainer()
-        {
-            var theme = _fixture.Create<TerminalTheme>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            themesContainer.Setup(x => x.ReadValueFromJson(theme.Id.ToString(), default(TerminalTheme))).Returns(theme);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetTheme(theme.Id);
-
-            result.Should().BeEquivalentTo(theme);
-            themesContainer.Verify(x => x.ReadValueFromJson(theme.Id.ToString(), default(TerminalTheme)), Times.Once);
-        }
-
-        [Fact]
-        public void GetTheme_UnknownThemeId_ReturnsNull()
-        {
-            var themeId = _fixture.Create<Guid>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            themesContainer.Setup(x => x.ReadValueFromJson(themeId.ToString(), default(TerminalTheme))).Returns(value: null);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                Themes = themesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetTheme(themeId);
-
-            result.Should().BeNull();
-            themesContainer.Verify(x => x.ReadValueFromJson(themeId.ToString(), default(TerminalTheme)), Times.Once);
-        }
-
-        [Fact]
-        public void GetTerminalOptions_Default_ReturnsTerminalOptionsFromRoamingSettings()
-        {
-            var terminalOptions = _fixture.Create<TerminalOptions>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            roamingSettings.Setup(x => x.ReadValueFromJson(nameof(TerminalOptions), It.IsAny<TerminalOptions>())).Returns(terminalOptions);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetTerminalOptions();
-
-            result.Should().BeEquivalentTo(terminalOptions);
-            roamingSettings.Verify(x => x.ReadValueFromJson(nameof(TerminalOptions), It.IsAny<TerminalOptions>()), Times.Once);
-        }
-
-        [Fact]
-        public void SaveTerminalOptions_Default_WritesToRoamingSettings()
-        {
-            var terminalOptions = _fixture.Create<TerminalOptions>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveTerminalOptions(terminalOptions);
-
-            roamingSettings.Verify(x => x.WriteValueAsJson(nameof(TerminalOptions), terminalOptions), Times.Once);
-        }
-
-        [Fact]
-        public void SaveTerminalOptions_Default_InvokesTerminalOptionsChangedEvent()
-        {
-            var terminalOptions = _fixture.Create<TerminalOptions>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var terminalOptionsChangedEventInvoked = false;
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.TerminalOptionsChanged += (s, e) => terminalOptionsChangedEventInvoked = true;
-
-            settingsService.SaveTerminalOptions(terminalOptions);
-
-            terminalOptionsChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void GetApplicationSettings_Default_ReturnsApplicationSettingsFromRoamingSettings()
-        {
-            var applicationSettings = _fixture.Create<ApplicationSettings>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            roamingSettings.Setup(x => x.ReadValueFromJson(nameof(ApplicationSettings), It.IsAny<ApplicationSettings>())).Returns(applicationSettings);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetApplicationSettings();
-
-            result.Should().BeEquivalentTo(applicationSettings);
-            roamingSettings.Verify(x => x.ReadValueFromJson(nameof(ApplicationSettings), It.IsAny<ApplicationSettings>()), Times.Once);
-        }
-
-        [Fact]
-        public void SaveApplicationSettings_Default_WritesToRoamingSettings()
-        {
-            var applicationSettings = _fixture.Create<ApplicationSettings>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveApplicationSettings(applicationSettings);
-
-            roamingSettings.Verify(x => x.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings), Times.Once);
-        }
-
-        [Fact]
-        public void SaveApplicationSettings_Default_InvokesApplicationSettingsChangedEvent()
-        {
-            var applicationSettings = _fixture.Create<ApplicationSettings>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationSettingsChangedEventInvoked = false;
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                RoamingSettings = roamingSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.ApplicationSettingsChanged += (s, e) => applicationSettingsChangedEventInvoked = true;
-
-            settingsService.SaveApplicationSettings(applicationSettings);
-
-            applicationSettingsChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void GetKeyBindings_KeyBindingsInKeyBindingsContainer_ReturnsKeyBindingsFromKeyBindingsContainer()
-        {
-            var commands = _fixture.CreateMany<Command>(5);
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            foreach (var command in commands)
-            {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null)).Returns(new Collection<KeyBinding> { });
-            }
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetCommandKeyBindings();
-
-            foreach (var command in commands)
-            {
-                keyBindingsContainer.Verify(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void GetKeyBindings_KeyBindingsNotInKeyBindingsContainer_ReturnsKeyBindingsFromDefaultValueProvider()
-        {
-            var commands = _fixture.CreateMany<Command>(5);
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            foreach (var command in commands)
-            {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(EnumHelper.GetEnumDescription(command), null)).Returns(new Collection<KeyBinding> { });
-            }
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            var result = settingsService.GetCommandKeyBindings();
-
-            foreach (Command command in Enum.GetValues(typeof(Command)))
-            {
-                defaultValueProvider.Verify(x => x.GetDefaultKeyBindings(command), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void SaveKeyBindings_Default_WritesToKeyBindingsContainer()
-        {
-            var command = _fixture.Create<Command>();
-            var keyBindings = _fixture.Create<ICollection<KeyBinding>>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
-
-            keyBindingsContainer.Verify(x => x.WriteValueAsJson(command.ToString(), keyBindings), Times.Once);
-        }
-
-        [Fact]
-        public void SaveKeyBindings_Default_InvokesKeyBindingsChangedEvent()
-        {
-            var command = _fixture.Create<Command>();
-            var keyBindings = _fixture.Create<Collection<KeyBinding>>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            var keyBindingsChangedEventInvoked = false;
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
-
-            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
-
-            keyBindingsChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void ResetKeyBindings_Default_WritesToKeyBindingsContainerFromDefaultValueProvider()
-        {
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            settingsService.ResetKeyBindings();
-
-            foreach (Command command in Enum.GetValues(typeof(Command)))
-            {
-                keyBindingsContainer.Verify(x => x.WriteValueAsJson(command.ToString(), It.IsAny<ICollection<KeyBinding>>()), Times.Once);
-                defaultValueProvider.Verify(x => x.GetDefaultKeyBindings(command), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void ResetKeyBindings_Default_InvokesKeyBindingsChangedEvent()
-        {
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            var keyBindingsChangedEventInvoked = false;
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
-
-            settingsService.ResetKeyBindings();
-
-            keyBindingsChangedEventInvoked.Should().BeTrue();
-        }
-
-        [Fact]
-        public void GetDefaultShellProfileId_ValueExistsInRoamingSettings_ReturnsDefaultShellProfileId()
-        {
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var localSettings = new Mock<IApplicationDataContainer>();
-            var defaultShellProfileId = (object)_fixture.Create<Guid>();
-            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out defaultShellProfileId)).Returns(true);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                LocalSettings = localSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetDefaultShellProfileId();
-
-            result.Should().Be((Guid)defaultShellProfileId);
-            localSettings.Verify(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out defaultShellProfileId), Times.Once);
-        }
-
-        [Fact]
-        public void GetDefaultShellProfileId_ValueDoesNotExistInRoamingSettings_ReturnsDefaultShellProfileIdFromDefaultValueProvider()
-        {
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            var defaultShellProfileId = _fixture.Create<Guid>();
-            defaultValueProvider.Setup(x => x.GetDefaultShellProfileId()).Returns(defaultShellProfileId);
-            var localSettings = new Mock<IApplicationDataContainer>();
-            var currentDefaultShellProfileId = (object)_fixture.Create<Guid>();
-            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentDefaultShellProfileId)).Returns(false);
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                LocalSettings = localSettings.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            var result = settingsService.GetDefaultShellProfileId();
-
-            result.Should().Be(defaultShellProfileId);
-            defaultValueProvider.Verify(x => x.GetDefaultShellProfileId(), Times.Once);
-            localSettings.Verify(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentDefaultShellProfileId), Times.Once);
-        }
-
-        [Fact]
-        public void GetShellProfiles_Default_CallsGetAllOnShellProfilesContainer()
-        {
-            var shellProfiles = _fixture.CreateMany<ShellProfile>(3);
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
-            shellProfilesContainer.Setup(x => x.GetAll()).Returns(shellProfiles.Select(JsonConvert.SerializeObject));
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = shellProfilesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            var result = settingsService.GetShellProfiles();
-
-            result.Should().BeEquivalentTo(shellProfiles);
-            shellProfilesContainer.Verify(x => x.GetAll(), Times.Once);
-        }
-
-        [Fact]
-        public void SaveShellProfile_Default_WritesToShellProfilesContainer()
-        {
-            var shellProfile = _fixture.Create<ShellProfile>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = shellProfilesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.SaveShellProfile(shellProfile);
-
-            shellProfilesContainer.Verify(x => x.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile), Times.Once);
-        }
-
-        [Fact]
-        public void DeleteShellProfile_Default_CallsDeleteOnShellProfilesContainer()
-        {
-            var shellProfileId = _fixture.Create<Guid>();
-            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
-            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = shellProfilesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-
-            settingsService.DeleteShellProfile(shellProfileId);
-
-            shellProfilesContainer.Verify(x => x.Delete(shellProfileId.ToString()), Times.Once);
-        }
-
-        [Fact]
-        public void GetDefaultShellProfile_ProfileNotFound_DefaultShellProfileIdGetsResetToDefault()
-        {
-            var currentShellProfileId = (object)_fixture.Create<Guid>();
-            var defaultShellProfile = _fixture.Create<ShellProfile>();
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            defaultValueProvider.Setup(x => x.GetDefaultShellProfileId()).Returns(defaultShellProfile.Id);
-            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
-            var localSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = shellProfilesContainer.Object,
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = localSettings.Object,
-                Themes = Mock.Of<IApplicationDataContainer>()
-            };
-            shellProfilesContainer.Setup(x => x.ReadValueFromJson(currentShellProfileId.ToString(), default(ShellProfile))).Returns(value: null);
-            shellProfilesContainer.Setup(x => x.ReadValueFromJson(defaultShellProfile.Id.ToString(), default(ShellProfile))).Returns(defaultShellProfile);
-            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentShellProfileId)).Returns(true);
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            var result = settingsService.GetDefaultShellProfile();
-
-            result.Should().Be(defaultShellProfile);
-            localSettings.Verify(x => x.SetValue(SettingsService.DefaultShellProfileKey, defaultShellProfile.Id), Times.Once);
-        }
-
-        [Fact]
-        public void GetCurrentTheme_ThemeNotFound_CurrentThemeIdGetsResetToDefault()
-        {
-            var currentThemeId = (object)_fixture.Create<Guid>();
-            var defaultTheme = _fixture.Create<TerminalTheme>();
-            var defaultValueProvider = new Mock<IDefaultValueProvider>();
-            defaultValueProvider.Setup(x => x.GetDefaultThemeId()).Returns(defaultTheme.Id);
-            var themesContainer = new Mock<IApplicationDataContainer>();
-            var roamingSettings = new Mock<IApplicationDataContainer>();
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                KeyBindings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                RoamingSettings = roamingSettings.Object,
-                Themes = themesContainer.Object
-            };
-            themesContainer.Setup(x => x.ReadValueFromJson(currentThemeId.ToString(), default(TerminalTheme))).Returns(value: null);
-            themesContainer.Setup(x => x.ReadValueFromJson(defaultTheme.Id.ToString(), default(TerminalTheme))).Returns(defaultTheme);
-            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
-            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
-
-            var result = settingsService.GetCurrentTheme();
-
-            result.Should().Be(defaultTheme);
-            roamingSettings.Verify(x => x.SetValue(SettingsService.CurrentThemeKey, defaultTheme.Id), Times.Once);
-        }
-    }
-}

FluentTerminal.App.Services.Test/TestData/AdventureTime.itermcolors

@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Ansi 0 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.016337040811777115</real>
-		<key>Green Component</key>
-		<real>0.016232240945100784</real>
-		<key>Red Component</key>
-		<real>0.020433688536286354</real>
-	</dict>
-	<key>Ansi 1 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.075083047151565552</real>
-		<key>Green Component</key>
-		<real>0.0</real>
-		<key>Red Component</key>
-		<real>0.73976802825927734</real>
-	</dict>
-	<key>Ansi 10 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.43171143531799316</real>
-		<key>Green Component</key>
-		<real>1</real>
-		<key>Red Component</key>
-		<real>0.61819148063659668</real>
-	</dict>
-	<key>Ansi 11 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.10242157429456711</real>
-		<key>Green Component</key>
-		<real>0.7578997015953064</real>
-		<key>Red Component</key>
-		<real>0.93761706352233887</real>
-	</dict>
-	<key>Ansi 12 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.77801346778869629</real>
-		<key>Green Component</key>
-		<real>0.59102588891983032</real>
-		<key>Red Component</key>
-		<real>0.096501544117927551</real>
-	</dict>
-	<key>Ansi 13 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.32394066452980042</real>
-		<key>Green Component</key>
-		<real>0.34950375556945801</real>
-		<key>Red Component</key>
-		<real>0.60686224699020386</real>
-	</dict>
-	<key>Ansi 14 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.95550096035003662</real>
-		<key>Green Component</key>
-		<real>0.97915208339691162</real>
-		<key>Red Component</key>
-		<real>0.78500419855117798</real>
-	</dict>
-	<key>Ansi 15 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.98438382148742676</real>
-		<key>Green Component</key>
-		<real>0.96043074131011963</real>
-		<key>Red Component</key>
-		<real>0.96449893712997437</real>
-	</dict>
-	<key>Ansi 2 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.092498354613780975</real>
-		<key>Green Component</key>
-		<real>0.6950421929359436</real>
-		<key>Red Component</key>
-		<real>0.28945007920265198</real>
-	</dict>
-	<key>Ansi 3 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.1164485365152359</real>
-		<key>Green Component</key>
-		<real>0.45553147792816162</real>
-		<key>Red Component</key>
-		<real>0.90543299913406372</real>
-	</dict>
-	<key>Ansi 4 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.77829605340957642</real>
-		<key>Green Component</key>
-		<real>0.28880593180656433</real>
-		<key>Red Component</key>
-		<real>0.059818677604198456</real>
-	</dict>
-	<key>Ansi 5 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.57602518796920776</real>
-		<key>Green Component</key>
-		<real>0.35004982352256775</real>
-		<key>Red Component</key>
-		<real>0.40191537141799927</real>
-	</dict>
-	<key>Ansi 6 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.59465551376342773</real>
-		<key>Green Component</key>
-		<real>0.64633101224899292</real>
-		<key>Red Component</key>
-		<real>0.43781715631484985</real>
-	</dict>
-	<key>Ansi 7 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.75428962707519531</real>
-		<key>Green Component</key>
-		<real>0.86175870895385742</real>
-		<key>Red Component</key>
-		<real>0.97308963537216187</real>
-	</dict>
-	<key>Ansi 8 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.7491685152053833</real>
-		<key>Green Component</key>
-		<real>0.48549851775169373</real>
-		<key>Red Component</key>
-		<real>0.30726605653762817</real>
-	</dict>
-	<key>Ansi 9 Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.35247993469238281</real>
-		<key>Green Component</key>
-		<real>0.37095117568969727</real>
-		<key>Red Component</key>
-		<real>0.98876720666885376</real>
-	</dict>
-	<key>Background Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.27054747939109802</real>
-		<key>Green Component</key>
-		<real>0.11274909973144531</real>
-		<key>Red Component</key>
-		<real>0.12003477662801743</real>
-	</dict>
-	<key>Bold Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.075083047151565552</real>
-		<key>Green Component</key>
-		<real>0.0</real>
-		<key>Red Component</key>
-		<real>0.73976802825927734</real>
-	</dict>
-	<key>Cursor Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.21945112943649292</real>
-		<key>Green Component</key>
-		<real>0.74987590312957764</real>
-		<key>Red Component</key>
-		<real>0.93704277276992798</real>
-	</dict>
-	<key>Cursor Text Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.037519864737987518</real>
-		<key>Green Component</key>
-		<real>0.032785907387733459</real>
-		<key>Red Component</key>
-		<real>0.02988031692802906</real>
-	</dict>
-	<key>Foreground Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.75428962707519531</real>
-		<key>Green Component</key>
-		<real>0.86175870895385742</real>
-		<key>Red Component</key>
-		<real>0.97308963537216187</real>
-	</dict>
-	<key>Selected Text Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.767447829246521</real>
-		<key>Green Component</key>
-		<real>0.85237473249435425</real>
-		<key>Red Component</key>
-		<real>0.95287787914276123</real>
-	</dict>
-	<key>Selection Color</key>
-	<dict>
-		<key>Blue Component</key>
-		<real>0.30699285864830017</real>
-		<key>Green Component</key>
-		<real>0.41871801018714905</real>
-		<key>Red Component</key>
-		<real>0.43789717555046082</real>
-	</dict>
-</dict>
-</plist>

FluentTerminal.App.Services.Test/ThemeParserFactoryTests.cs

@@ -1,45 +0,0 @@
-using AutoFixture;
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using Moq;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class ThemeParserFactoryTests
-    {
-        private readonly Fixture _fixture;
-
-        public ThemeParserFactoryTests()
-        {
-            _fixture = new Fixture();
-        }
-
-        [Fact]
-        public void GetParser_SupportedFileType_ReturnsParser()
-        {
-            var supportedFileType = _fixture.Create<string>();
-            var parser = new Mock<IThemeParser>();
-            parser.Setup(x => x.SupportedFileTypes).Returns(new string[] { supportedFileType });
-            var themeParserFactory = new ThemeParserFactory(new IThemeParser[] { parser.Object });
-
-            var result = themeParserFactory.GetParser(supportedFileType);
-
-            parser.Should().Be(parser);
-        }
-
-        [Fact]
-        public void GetParser_UnsupportedFileType_ReturnsNull()
-        {
-            var unSupportedFileType = _fixture.Create<string>();
-            var supportedFileType = _fixture.Create<string>();
-            var parser = new Mock<IThemeParser>();
-            parser.Setup(x => x.SupportedFileTypes).Returns(new string[] { supportedFileType });
-            var themeParserFactory = new ThemeParserFactory(new IThemeParser[] { parser.Object });
-
-            var result = themeParserFactory.GetParser(unSupportedFileType);
-
-            result.Should().BeNull();
-        }
-    }
-}

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

@@ -1,185 +0,0 @@
-using AutoFixture;
-using FluentAssertions;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using FluentTerminal.Models.Requests;
-using FluentTerminal.Models.Responses;
-using Moq;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace FluentTerminal.App.Services.Test
-{
-    public class TrayProcessCommunicationServiceTests
-    {
-        private readonly Fixture _fixture;
-
-        public TrayProcessCommunicationServiceTests()
-        {
-            _fixture = new Fixture();
-        }
-
-        [Fact]
-        public async Task CreateTerminal_Default_ReturnsResponseFromAppServiceConnection()
-        {
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            var response = _fixture.Create<CreateTerminalResponse>();
-            var responseMessage = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = _fixture.Create<string>(),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(response)
-            };
-            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<IDictionary<string, string>>())).Returns(Task.FromResult((IDictionary<string, string>)responseMessage));
-            var terminalSize = _fixture.Create<TerminalSize>();
-            var shellProfile = _fixture.Create<ShellProfile>();
-            var sessionType = _fixture.Create<SessionType>();
-            var id = _fixture.Create<int>();
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-
-            var result = await trayProcessCommunicationService.CreateTerminal(id, terminalSize, shellProfile, sessionType);
-
-            result.Should().BeEquivalentTo(response);
-        }
-
-        [Fact]
-        public async Task ResizeTerminal_Default_SendsResizeTerminalRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            var terminalSize = _fixture.Create<TerminalSize>();
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-
-            await trayProcessCommunicationService.ResizeTerminal(terminalId, terminalSize);
-
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(ResizeTerminalRequest))), Times.Once);
-        }
-
-        [Fact]
-        public async Task Write_Default_SendsWriteDataRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            var data = _fixture.Create<byte[]>();
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-
-            await trayProcessCommunicationService.Write(terminalId, data);
-
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteDataRequest))), Times.Once);
-        }
-
-        [Fact]
-        public async Task CloseTerminal_Default_SendsTerminalExitedRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-
-            await trayProcessCommunicationService.CloseTerminal(terminalId);
-
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(TerminalExitedRequest))), Times.Once);
-        }
-
-        [Fact]
-        public void OnMessageReceived_TerminalExitedRequest_InvokesTerminalExitedEvent()
-        {
-            var terminalId = _fixture.Create<int>();
-            var receivedTerminalId = 0;
-            var terminalExitedEventCalled = false;
-            var request = new TerminalExitedRequest
-            {
-                TerminalId = terminalId
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(TerminalExitedRequest),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
-            };
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-            trayProcessCommunicationService.TerminalExited += (s, e) =>
-            {
-                terminalExitedEventCalled = true;
-                receivedTerminalId = e;
-            };
-
-            appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
-
-            terminalExitedEventCalled.Should().BeTrue();
-            receivedTerminalId.Should().Be(terminalId);
-        }
-
-        [Fact]
-        public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
-        {
-            var terminalId = _fixture.Create<int>();
-            var output = _fixture.Create<byte[]>();
-            var receivedOutput = default(byte[]);
-            var request = new DisplayTerminalOutputRequest
-            {
-                TerminalId = terminalId,
-                Output = output
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(DisplayTerminalOutputRequest),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
-            };
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
-            });
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            var appServiceConnection = new Mock<IAppServiceConnection>();
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-            trayProcessCommunicationService.SubscribeForTerminalOutput(terminalId, o =>
-            {
-                receivedOutput = o;
-            });
-
-            appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
-
-            receivedOutput.Should().BeEquivalentTo(output);
-        }
-    }
-}

FluentTerminal.App.Services/ApplicationDataContainers.cs

@@ -8,4 +8,4 @@
         public IApplicationDataContainer KeyBindings { get; set; }
         public IApplicationDataContainer ShellProfiles { get; set; }
     }
-}
+}

FluentTerminal.App.Services/Constants.cs

@@ -1,9 +0,0 @@
-namespace FluentTerminal.App.Services
-{
-    public static class Constants
-    {
-        public const string ThemesContainerName = "Themes";
-        public const string KeyBindingsContainerName = "KeyBindings";
-        public const string ShellProfilesContainerName = "ShellProfiles";
-    }
-}

FluentTerminal.App.Services/Dialogs/ICreateKeyBindingDialog.cs

@@ -7,4 +7,4 @@ namespace FluentTerminal.App.Services.Dialogs
     {
         Task<KeyBinding> CreateKeyBinding();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/IInputDialog.cs

@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services.Dialogs
-{
-    public interface IInputDialog
-    {
-        void SetTitle(string title);
-        Task<string> GetInput();
-    }
-}

FluentTerminal.App.Services/Dialogs/IMessageDialog.cs

@@ -11,4 +11,4 @@ namespace FluentTerminal.App.Services.Dialogs
 
         Task<DialogButton> ShowAsync();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/IShellProfileSelectionDialog.cs

@@ -9,4 +9,4 @@ namespace FluentTerminal.App.Services.Dialogs
 
         Task<ShellProfile> SelectProfile();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/ISshConnectionInfo.cs

@@ -1,11 +0,0 @@
-namespace FluentTerminal.App.Services.Dialogs
-{
-    public interface ISshConnectionInfo
-    {
-        string Host { get; set; }
-
-        ushort Port { get; set; }
-
-        string Username { get; set; }
-    }
-}

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services.Dialogs
-{
-    public interface ISshConnectionInfoDialog
-    {
-        Task<ISshConnectionInfo> GetSshConnectionInfoAsync();
-    }
-}

FluentTerminal.App.Services/EventArgs/CancelableEventArgs.cs

@@ -4,4 +4,4 @@
     {
         public bool Cancelled { get; set; }
     }
-}
+}

FluentTerminal.App.Services/EventArgs/NewWindowRequestedEventArgs.cs

@@ -1,7 +0,0 @@
-namespace FluentTerminal.App.Services.EventArgs
-{
-    public class NewWindowRequestedEventArgs : System.EventArgs
-    {
-        public bool ShowProfileSelection { get; set; }
-    }
-}

FluentTerminal.App.Services/FluentTerminal.App.Services.csproj

@@ -1,33 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <LangVersion>7.1</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="PListNet" Version="2.0.3" />
-    <PackageReference Include="RestSharp" Version="106.6.9" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FluentTerminal.Models\FluentTerminal.Models.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-
 </Project>

FluentTerminal.App.Services/IAppServiceConnection.cs

@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
 {
     public interface IAppServiceConnection
     {
-        event EventHandler<IDictionary<string, string>> MessageReceived;
-
         Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message);
     }
-}
+}

FluentTerminal.App.Services/IApplicationDataContainer.cs

@@ -16,4 +16,4 @@ namespace FluentTerminal.App.Services
 
         IEnumerable<object> GetAll();
     }
-}
+}

FluentTerminal.App.Services/IApplicationView.cs

@@ -9,16 +9,11 @@ namespace FluentTerminal.App.Services
     public interface IApplicationView
     {
         event CloseRequestedHandler CloseRequested;
-        event EventHandler Closed;
 
-        int Id { get; }
         string Title { get; set; }
 
         Task RunOnDispatcherThread(Action action);
-
         Task<bool> TryClose();
-
         bool ToggleFullScreen();
-        bool IsApiContractPresent(string api, ushort version);
     }
-}
+}

FluentTerminal.App.Services/IClipboardService.cs

@@ -5,7 +5,6 @@ namespace FluentTerminal.App.Services
     public interface IClipboardService
     {
         Task<string> GetText();
-
         void SetText(string text);
     }
-}
+}

FluentTerminal.App.Services/IDefaultValueProvider.cs

@@ -7,20 +7,12 @@ namespace FluentTerminal.App.Services
 {
     public interface IDefaultValueProvider
     {
-        ApplicationSettings GetDefaultApplicationSettings();
-
-        ICollection<KeyBinding> GetDefaultKeyBindings(Command command);
-
-        Guid GetDefaultShellProfileId();
-
-        IEnumerable<TabTheme> GetDefaultTabThemes();
-
-        TerminalOptions GetDefaultTerminalOptions();
-
-        Guid GetDefaultThemeId();
-
         IEnumerable<ShellProfile> GetPreinstalledShellProfiles();
-
+        Guid GetDefaultShellProfileId();
+        TerminalOptions GetDefaultTerminalOptions();
+        ICollection<KeyBinding> GetDefaultKeyBindings(Command command);
+        ApplicationSettings GetDefaultApplicationSettings();
+        Guid GetDefaultThemeId();
         IEnumerable<TerminalTheme> GetPreInstalledThemes();
     }
-}
+}

FluentTerminal.App.Services/IDialogService.cs

@@ -1,6 +1,5 @@
 using FluentTerminal.Models;
 using System.Threading.Tasks;
-using FluentTerminal.App.Services.Dialogs;
 
 namespace FluentTerminal.App.Services
 {
@@ -17,8 +16,5 @@ namespace FluentTerminal.App.Services
         Task<ShellProfile> ShowProfileSelectionDialogAsync();
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
-        Task<string> ShowInputDialogAsync(string title);
-
-        Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync();
     }
-}
+}

FluentTerminal.App.Services/IDispatcherTimer.cs

@@ -5,7 +5,6 @@ namespace FluentTerminal.App.Services
     public interface IDispatcherTimer
     {
         void Start();
-
         void Stop();
 
         TimeSpan Interval { get; set; }
@@ -13,4 +12,4 @@ namespace FluentTerminal.App.Services
 
         event EventHandler<object> Tick;
     }
-}
+}

FluentTerminal.App.Services/IFileSystemService.cs

@@ -12,4 +12,4 @@ namespace FluentTerminal.App.Services
 
         Task SaveTextFile(string name, string fileTypeDescription, string fileType, string content);
     }
-}
+}

FluentTerminal.App.Services/IKeyboardCommandService.cs

@@ -1,12 +1,11 @@
-using System;
+using FluentTerminal.Models.Enums;
+using System;
 
 namespace FluentTerminal.App.Services
 {
     public interface IKeyboardCommandService
     {
-        void RegisterCommandHandler(string command, Action handler);
-
-        void SendCommand(string command);
-        void DeregisterCommandHandler(string command);
+        void RegisterCommandHandler(Command command, Action handler);
+        void SendCommand(Command command);
     }
-}
+}

FluentTerminal.App.Services/INotificationService.cs

@@ -1,7 +0,0 @@
-namespace FluentTerminal.App.Services
-{
-    public interface INotificationService
-    {
-        void ShowNotification(string title, string content, string url = null);
-    }
-}

FluentTerminal.App.Services/ISettingsService.cs

@@ -1,4 +1,5 @@
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
 
@@ -6,36 +7,36 @@ namespace FluentTerminal.App.Services
 {
     public interface ISettingsService
     {
-        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
         event EventHandler<Guid> CurrentThemeChanged;
-        event EventHandler KeyBindingsChanged;
-        event EventHandler<ShellProfile> ShellProfileAdded;
-        event EventHandler<Guid> ShellProfileDeleted;
         event EventHandler<TerminalOptions> TerminalOptionsChanged;
-        event EventHandler<Guid> ThemeDeleted;
-        event EventHandler<TerminalTheme> ThemeAdded;
+        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
+        event EventHandler KeyBindingsChanged;
 
+        Guid GetDefaultShellProfileId();
+        ShellProfile GetDefaultShellProfile();
+        void SaveDefaultShellProfileId(Guid id);
+
+        IEnumerable<ShellProfile> GetShellProfiles();
+        void SaveShellProfile(ShellProfile shellProfile);
         void DeleteShellProfile(Guid id);
-        void DeleteTheme(Guid id);
+
+        TerminalOptions GetTerminalOptions();
+        void SaveTerminalOptions(TerminalOptions terminalOptions);
+
         ApplicationSettings GetApplicationSettings();
+        void SaveApplicationSettings(ApplicationSettings applicationSettings);
+
+        IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings();
+        void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings);
+        void ResetKeyBindings();
+
         TerminalTheme GetCurrentTheme();
         Guid GetCurrentThemeId();
-        ShellProfile GetDefaultShellProfile();
-        Guid GetDefaultShellProfileId();
-        IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
-        IEnumerable<ShellProfile> GetShellProfiles();
-        IEnumerable<TabTheme> GetTabThemes();
-        TerminalOptions GetTerminalOptions();
         TerminalTheme GetTheme(Guid id);
-        IEnumerable<TerminalTheme> GetThemes();
-        void ResetKeyBindings();
-        void SaveApplicationSettings(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
-        void SaveDefaultShellProfileId(Guid id);
-        void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
-        void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
-        void SaveTerminalOptions(TerminalOptions terminalOptions);
-        void SaveTheme(TerminalTheme theme, bool newTheme = false);
-        ShellProfile GetShellProfile(Guid id);
+
+        IEnumerable<TerminalTheme> GetThemes();
+        void SaveTheme(TerminalTheme theme);
+        void DeleteTheme(Guid id);
     }
-}
+}

FluentTerminal.App.Services/IStartupTaskService.cs

@@ -1,12 +0,0 @@
-using FluentTerminal.Models.Enums;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services
-{
-    public interface IStartupTaskService
-    {
-        Task DisableStartupTask();
-        Task<StartupTaskStatus> EnableStartupTask();
-        Task<StartupTaskStatus> GetStatus();
-    }
-}

FluentTerminal.App.Services/ISystemFontService.cs

@@ -1,10 +1,9 @@
-using FluentTerminal.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace FluentTerminal.App.Services
 {
     public interface ISystemFontService
     {
-        IEnumerable<FontInfo> GetSystemFontFamilies();
+        IEnumerable<string> GetSystemFontFamilies();
     }
-}
+}

FluentTerminal.App.Services/ITerminalView.cs

@@ -0,0 +1,28 @@
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public interface ITerminalView
+    {
+        event EventHandler<TerminalSize> TerminalSizeChanged;
+        event EventHandler<string> TerminalTitleChanged;
+        event EventHandler<Command> KeyboardCommandReceived;
+
+        Task ChangeTheme(TerminalColors theme);
+        Task ChangeOptions(TerminalOptions options);
+        Task ChangeKeyBindings(IEnumerable<KeyBinding> keyBindings);
+        Task<TerminalSize> CreateTerminal(TerminalOptions options, TerminalColors theme, IEnumerable<KeyBinding> keyBindings);
+        Task ConnectToSocket(string url);
+        void Close();
+        Task FocusTerminal();
+        Task<string> GetSelection();
+        Task Write(string text);
+        Task FindNext(string searchText);
+        Task FindPrevious(string searchText);
+        void FocusSearchTextBox();
+    }
+}

FluentTerminal.App.Services/IThemeParser.cs

@@ -11,4 +11,4 @@ namespace FluentTerminal.App.Services
 
         Task<TerminalTheme> Parse(string fileName, Stream fileContent);
     }
-}
+}

FluentTerminal.App.Services/IThemeParserFactory.cs

@@ -8,4 +8,4 @@ namespace FluentTerminal.App.Services
 
         IThemeParser GetParser(string fileType);
     }
-}
+}

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -1,29 +1,14 @@
 using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Responses;
-using System;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
 {
     public interface ITrayProcessCommunicationService
     {
-        event EventHandler<int> TerminalExited;
-
-        void Initialize(IAppServiceConnection appServiceConnection);
-
-        Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
-
+        Task Initialize(IAppServiceConnection appServiceConnection);
+        Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile);
         Task ResizeTerminal(int id, TerminalSize size);
-
         Task UpdateToggleWindowKeyBindings();
-
-        Task Write(int terminalId, byte[] data);
-
-        void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback);
-
-        Task CloseTerminal(int terminalId);
-        Task<GetAvailablePortResponse> GetAvailablePort();
-        int GetNextTerminalId();
     }
-}
+}

FluentTerminal.App.Services/IUpdateService.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services
-{
-    public interface IUpdateService
-    {
-        Task CheckForUpdate(bool notifyNoUpdate = false);
-        Version GetCurrentVersion();
-        Task<Version> GetLatestVersionAsync();
-    }
-}

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -14,17 +14,7 @@ namespace FluentTerminal.App.Services.Implementation
                 ConfirmClosingTabs = false,
                 ConfirmClosingWindows = false,
                 UnderlineSelectedTab = false,
-                InactiveTabColorMode = InactiveTabColorMode.Background,
-                NewTerminalLocation = NewTerminalLocation.Tab,
-                TabsPosition = TabsPosition.Top,
-                CopyOnSelect = false,
-                MouseMiddleClickAction = MouseAction.None,
-                MouseRightClickAction = MouseAction.ContextMenu,
-                AlwaysShowTabs = false,
-                AlwaysUseWinPty = true,
-                ShowNewOutputIndicator = false,
-                EnableTrayIcon = true,
-                ShowCustomTitleInTitlebar = true
+                NewTerminalLocation = NewTerminalLocation.Tab
             };
         }
 
@@ -33,11 +23,11 @@ namespace FluentTerminal.App.Services.Implementation
             switch (command)
             {
                 case Command.ToggleWindow:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ToggleWindow),
+                        Command = Command.ToggleWindow,
                         Ctrl = false,
                         Alt = false,
                         Shift = false,
@@ -46,11 +36,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.NextTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NextTab),
+                        Command = Command.NextTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -59,11 +49,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.PreviousTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.PreviousTab),
+                        Command = Command.PreviousTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -71,33 +61,12 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
-                case Command.SwitchToTerm1:
-                case Command.SwitchToTerm2:
-                case Command.SwitchToTerm3:
-                case Command.SwitchToTerm4:
-                case Command.SwitchToTerm5:
-                case Command.SwitchToTerm6:
-                case Command.SwitchToTerm7:
-                case Command.SwitchToTerm8:
-                case Command.SwitchToTerm9:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = command.ToString(),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = false,
-                        Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
-                    }
-                };
-
                 case Command.NewTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NewTab),
+                        Command = Command.NewTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -106,11 +75,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.ConfigurableNewTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ConfigurableNewTab),
+                        Command = Command.ConfigurableNewTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -118,38 +87,12 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
-                case Command.NewRemoteTab:
-                    return new List<KeyBinding>
-                    {
-                        new KeyBinding
-                        {
-                            Command = nameof(Command.NewRemoteTab),
-                            Ctrl = false,
-                            Alt = true,
-                            Shift = false,
-                            Key = (int)ExtendedVirtualKey.T
-                        }
-                    };
-
-                case Command.ChangeTabTitle:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.ChangeTabTitle),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = true,
-                        Key = (int)ExtendedVirtualKey.R
-                    }
-                };
-
                 case Command.CloseTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.CloseTab),
+                        Command = Command.CloseTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -158,11 +101,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.NewWindow:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NewWindow),
+                        Command = Command.NewWindow,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -170,25 +113,12 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
-                case Command.ConfigurableNewWindow:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.ConfigurableNewWindow),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = true,
-                        Key = (int)ExtendedVirtualKey.N
-                    }
-                };
-
                 case Command.ShowSettings:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ShowSettings),
+                        Command = Command.ShowSettings,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -197,11 +127,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Copy:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Copy),
+                        Command = Command.Copy,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -210,11 +140,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Paste:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Paste),
+                        Command = Command.Paste,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -222,26 +152,12 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
-
-                case Command.PasteWithoutNewlines:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.PasteWithoutNewlines),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = true,
-                        Key = (int)ExtendedVirtualKey.V
-                    }
-                };
-
                 case Command.Search:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Search),
+                        Command = Command.Search,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -250,11 +166,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.ToggleFullScreen:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ToggleFullScreen),
+                        Command = Command.ToggleFullScreen,
                         Ctrl = false,
                         Alt = true,
                         Shift = false,
@@ -263,11 +179,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.SelectAll:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.SelectAll),
+                        Command = Command.SelectAll,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -276,11 +192,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Clear:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Clear),
+                        Command = Command.Clear,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -297,59 +213,6 @@ namespace FluentTerminal.App.Services.Implementation
             return Guid.Parse("813f2298-210a-481a-bdbf-c17bc637a3e2");
         }
 
-        public IEnumerable<TabTheme> GetDefaultTabThemes()
-        {
-            return new[]
-            {
-                new TabTheme
-                {
-                    Id = 0,
-                    Name = "None",
-                    BackgroundOpacity = double.NaN,
-                    BackgroundPointerOverOpacity = double.NaN,
-                    BackgroundPressedOpacity = double.NaN,
-                    BackgroundSelectedOpacity = double.NaN,
-                    BackgroundSelectedPointerOverOpacity = double.NaN,
-                    BackgroundSelectedPressedOpacity = double.NaN
-                },
-                new TabTheme
-                {
-                    Id = 1,
-                    Name = "Red",
-                    Color = "#E81123"
-                },
-                new TabTheme
-                {
-                    Id = 2,
-                    Name = "Green",
-                    Color = "#10893E"
-                },
-                new TabTheme
-                {
-                    Id = 3,
-                    Name = "Blue",
-                    Color = "#0078D7"
-                },
-                new TabTheme
-                {
-                    Id = 4,
-                    Name = "Purple",
-                    Color = "#881798"
-                },
-                new TabTheme
-                {
-                    Id = 5,
-                    Name = "Orange",
-                    Color = "#FF8C00"
-                },
-                new TabTheme
-                {
-                    Id = 6,
-                    Name = "Teal",
-                    Color = "#00B7C3"
-                }
-            };
-        }
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -360,9 +223,7 @@ namespace FluentTerminal.App.Services.Implementation
                 ScrollBarStyle = ScrollBarStyle.Hidden,
                 FontFamily = "Consolas",
                 FontSize = 13,
-                BoldText = false,
                 BackgroundOpacity = 0.8,
-                Padding = 12,
                 ScrollBackLimit = 1000
             };
         }
@@ -383,20 +244,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = GetDefaultShellProfileId().ToString(),
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number1
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 },
                 new ShellProfile
                 {
@@ -405,20 +253,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = "ab942a61-7673-4755-9bd8-765aff91d9a3",
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number2
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 },
                 new ShellProfile
                 {
@@ -427,20 +262,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = "e5785ad6-584f-40cb-bdcd-d5b3b3953e7f",
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number3
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 }
             };
         }
@@ -589,20 +411,20 @@ namespace FluentTerminal.App.Services.Implementation
                     CursorAccent = "#000000",
                     Selection = "#4DABEDC1",
                     Black = "#300A24",
-                    Red = "#CC0000",
+                    Red = "#3465A4",
                     Green = "#4E9A06",
-                    Yellow = "#C4A000",
-                    Blue = "#3465A4",
+                    Yellow = "#06989A",
+                    Blue = "#CC0000",
                     Magenta = "#75507B",
-                    Cyan = "#06989A",
+                    Cyan = "#C4A000",
                     White = "#D3D7CF",
                     BrightBlack = "#554E53",
-                    BrightRed = "#EF2929",
+                    BrightRed = "#729FCF",
                     BrightGreen = "#8AE234",
-                    BrightYellow = "#FCE94F",
-                    BrightBlue = "#729FCF",
+                    BrightYellow = "#34E2E2",
+                    BrightBlue = "#EF2929",
                     BrightMagenta = "#AD7FA8",
-                    BrightCyan = "#34E2E2",
+                    BrightCyan = "#FCE94F",
                     BrightWhite = "#EEEEEE"
                 }
             };

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -1,7 +1,7 @@
-using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.Models;
-using System;
+using System;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.Models;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -10,18 +10,12 @@ namespace FluentTerminal.App.Services.Implementation
         private readonly Func<IShellProfileSelectionDialog> _shellProfileSelectionDialogFactory;
         private readonly Func<IMessageDialog> _messageDialogFactory;
         private readonly Func<ICreateKeyBindingDialog> _createKeyBindingDialogFactory;
-        private readonly Func<IInputDialog> _inputDialogFactory;
-        private readonly Func<ISshConnectionInfoDialog> _sshConnectionInfoDialogFactory;
 
-        public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory,
-            Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory,
-            Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory)
+        public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory, Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory)
         {
             _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
             _createKeyBindingDialogFactory = createKeyBindingDialogFactory;
-            _inputDialogFactory = inputDialogFactory;
-            _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -60,22 +54,11 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.ShowAsync();
         }
 
-        public Task<string> ShowInputDialogAsync(string title)
-        {
-            var dialog = _inputDialogFactory.Invoke();
-            dialog.SetTitle(title);
-
-            return dialog.GetInput();
-        }
-
         public Task<ShellProfile> ShowProfileSelectionDialogAsync()
         {
             var dialog = _shellProfileSelectionDialogFactory();
 
             return dialog.SelectProfile();
         }
-
-        public Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync() =>
-            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync();
     }
-}
+}

FluentTerminal.App.Services/Implementation/FluentTerminalThemeParser.cs

@@ -1,9 +1,9 @@
-using FluentTerminal.Models;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using FluentTerminal.Models;
+using Newtonsoft.Json;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -13,16 +13,6 @@ namespace FluentTerminal.App.Services.Implementation
 
         public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
-            if (string.IsNullOrWhiteSpace(fileName))
-            {
-                throw new ArgumentNullException(nameof(fileName));
-            }
-
-            if (fileContent == null)
-            {
-                throw new ArgumentNullException(nameof(fileContent));
-            }
-
             using (var streamReader = new StreamReader(fileContent))
             {
                 var content = await streamReader.ReadToEndAsync();
@@ -35,4 +25,4 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

@@ -53,16 +53,6 @@ namespace FluentTerminal.App.Services.Implementation
 
         public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
-            if (string.IsNullOrWhiteSpace(fileName))
-            {
-                throw new ArgumentNullException(nameof(fileName));
-            }
-
-            if (fileContent == null)
-            {
-                throw new ArgumentNullException(nameof(fileContent));
-            }
-
             var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
 
             return new TerminalTheme
@@ -134,4 +124,4 @@ namespace FluentTerminal.App.Services.Implementation
             return (alpha / 256.0).ToString(CultureInfo.InvariantCulture);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -1,46 +1,38 @@
-using FluentTerminal.Models.Enums;
-using System;
-using System.Collections.Generic;
-
-namespace FluentTerminal.App.Services.Implementation
-{
-    public class KeyboardCommandService : IKeyboardCommandService
-    {
-        private readonly Dictionary<string, Action> _commandHandlers = new Dictionary<string, Action>();
-
-        public void RegisterCommandHandler(string command, Action handler)
-        {
-            if (_commandHandlers.ContainsKey(command))
-            {
-                throw new InvalidOperationException("command already registered");
-            }
-
-            _commandHandlers[command] = handler ?? throw new ArgumentNullException(nameof(handler));
-        }
-
-        public void DeregisterCommandHandler(string command)
-        {
-            if (_commandHandlers.ContainsKey(command))
-            {
-                _commandHandlers.Remove(command);
-            }
-        }
-
-        public void SendCommand(string command)
-        {
-            if (_commandHandlers.TryGetValue(command, out Action handler))
-            {
-                handler.Invoke();
-                return;
-            }
-
+using System;
+using System.Collections.Generic;
+using FluentTerminal.Models.Enums;
+
+namespace FluentTerminal.App.Services.Implementation
+{
+    public class KeyboardCommandService : IKeyboardCommandService
+    {
+        private readonly Dictionary<Command, Action> _commandHandlers = new Dictionary<Command, Action>();
+
+        public void RegisterCommandHandler(Command command, Action handler)
+        {
+            if (_commandHandlers.ContainsKey(command))
+            {
+                throw new InvalidOperationException("command already registered");
+            }
+
+            _commandHandlers[command] = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public void SendCommand(Command command)
+        {
+            if (_commandHandlers.TryGetValue(command, out Action handler))
+            {
+                handler.Invoke();
+                return;
+            }
+
             // already registered by SystemTray's ToggleWindowService
-            if (command == nameof(Command.ToggleWindow))
+            if (command == Command.ToggleWindow)
             {
                 return;
-            }
-
-            throw new KeyNotFoundException($"No handler registered for command: {command}");
-        }
-    }
-}
+            }
+
+            throw new KeyNotFoundException($"No handler registered for command: {command}");
+        }
+    }
+}

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -1,10 +1,10 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Newtonsoft.Json;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -14,11 +14,16 @@ namespace FluentTerminal.App.Services.Implementation
         public const string DefaultShellProfileKey = "DefaultShellProfile";
 
         private readonly IDefaultValueProvider _defaultValueProvider;
-        private readonly IApplicationDataContainer _keyBindings;
         private readonly IApplicationDataContainer _localSettings;
-        private readonly IApplicationDataContainer _roamingSettings;
-        private readonly IApplicationDataContainer _shellProfiles;
         private readonly IApplicationDataContainer _themes;
+        private readonly IApplicationDataContainer _keyBindings;
+        private readonly IApplicationDataContainer _shellProfiles;
+        private readonly IApplicationDataContainer _roamingSettings;
+
+        public event EventHandler<Guid> CurrentThemeChanged;
+        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
+        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
+        public event EventHandler KeyBindingsChanged;
 
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
         {
@@ -32,72 +37,19 @@ namespace FluentTerminal.App.Services.Implementation
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
-                if (GetTheme(theme.Id) == null)
-                {
-                    _themes.WriteValueAsJson(theme.Id.ToString(), theme);
-                }
+                _themes.WriteValueAsJson(theme.Id.ToString(), theme);
             }
 
             foreach (var shellProfile in _defaultValueProvider.GetPreinstalledShellProfiles())
             {
-                if (GetShellProfile(shellProfile.Id) == null)
-                {
-                    _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
-                }
+                _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
             }
         }
 
-        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-
-        public event EventHandler<TerminalTheme> ThemeAdded;
-        public event EventHandler<Guid> CurrentThemeChanged;
-        public event EventHandler<Guid> ThemeDeleted;
-
-        public event EventHandler KeyBindingsChanged;
-
-        public event EventHandler<ShellProfile> ShellProfileAdded;
-        public event EventHandler<Guid> ShellProfileDeleted;
-
-        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
-
-        public void DeleteShellProfile(Guid id)
-        {
-            _shellProfiles.Delete(id.ToString());
-            ShellProfileDeleted?.Invoke(this, id);
-        }
-
-        public void DeleteTheme(Guid id)
-        {
-            _themes.Delete(id.ToString());
-
-            foreach (var profile in GetShellProfiles())
-            {
-                if (profile.TerminalThemeId == id)
-                {
-                    profile.TerminalThemeId = Guid.Empty;
-                    SaveShellProfile(profile);
-                }
-            }
-
-            ThemeDeleted?.Invoke(this, id);
-        }
-
-        public ApplicationSettings GetApplicationSettings()
-        {
-            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
-        }
-
         public TerminalTheme GetCurrentTheme()
         {
             var id = GetCurrentThemeId();
-            var theme = GetTheme(id);
-            if (theme == null)
-            {
-                id = _defaultValueProvider.GetDefaultThemeId();
-                SaveCurrentThemeId(id);
-                theme = GetTheme(id);
-            }
-            return theme;
+            return GetTheme(id);
         }
 
         public Guid GetCurrentThemeId()
@@ -109,85 +61,6 @@ namespace FluentTerminal.App.Services.Implementation
             return _defaultValueProvider.GetDefaultThemeId();
         }
 
-        public ShellProfile GetDefaultShellProfile()
-        {
-            var id = GetDefaultShellProfileId();
-            var profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-            if (profile == null)
-            {
-                id = _defaultValueProvider.GetDefaultShellProfileId();
-                SaveDefaultShellProfileId(id);
-                profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-            }
-            return profile;
-        }
-
-        public ShellProfile GetShellProfile(Guid id)
-        {
-            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-        }
-
-        public Guid GetDefaultShellProfileId()
-        {
-            if (_localSettings.TryGetValue(DefaultShellProfileKey, out object value))
-            {
-                return (Guid)value;
-            }
-            return _defaultValueProvider.GetDefaultShellProfileId();
-        }
-
-        public IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings()
-        {
-            var keyBindings = new Dictionary<string, ICollection<KeyBinding>>();
-
-            foreach (Command command in Enum.GetValues(typeof(Command)))
-            {
-                keyBindings.Add(command.ToString(), _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
-            }
-            return keyBindings;
-        }
-
-        public IEnumerable<ShellProfile> GetShellProfiles()
-        {
-            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
-        }
-
-        public IEnumerable<TabTheme> GetTabThemes()
-        {
-            return _defaultValueProvider.GetDefaultTabThemes();
-        }
-
-        public TerminalOptions GetTerminalOptions()
-        {
-            return _roamingSettings.ReadValueFromJson(nameof(TerminalOptions), _defaultValueProvider.GetDefaultTerminalOptions());
-        }
-
-        public TerminalTheme GetTheme(Guid id)
-        {
-            return _themes.ReadValueFromJson(id.ToString(), default(TerminalTheme));
-        }
-
-        public IEnumerable<TerminalTheme> GetThemes()
-        {
-            return _themes.GetAll().Select(x => JsonConvert.DeserializeObject<TerminalTheme>((string)x)).ToList();
-        }
-
-        public void ResetKeyBindings()
-        {
-            foreach (Command command in Enum.GetValues(typeof(Command)))
-            {
-                _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
-            }
-
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
-        }
-
-        public void SaveApplicationSettings(ApplicationSettings applicationSettings)
-        {
-            _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
-        }
-
         public void SaveCurrentThemeId(Guid id)
         {
             _roamingSettings.SetValue(CurrentThemeKey, id);
@@ -195,33 +68,34 @@ namespace FluentTerminal.App.Services.Implementation
             CurrentThemeChanged?.Invoke(this, id);
         }
 
-        public void SaveDefaultShellProfileId(Guid id)
+        public void SaveTheme(TerminalTheme theme)
         {
-            _localSettings.SetValue(DefaultShellProfileKey, id);
+            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+
+            if (theme.Id == GetCurrentThemeId())
+            {
+                CurrentThemeChanged?.Invoke(this, theme.Id);
+            }
         }
 
-        public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
+        public void DeleteTheme(Guid id)
         {
-            if (!Enum.IsDefined(typeof(Command), command))
-            {
-                throw new InvalidOperationException();
-            }
-
-            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            _themes.Delete(id.ToString());
         }
 
-        public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
+        public IEnumerable<TerminalTheme> GetThemes()
         {
-            _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+            return _themes.GetAll().Select(x => JsonConvert.DeserializeObject<TerminalTheme>((string)x)).ToList();
+        }
 
-            // When saving the shell profile, we also need to update keybindings for everywhere.
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+        public TerminalTheme GetTheme(Guid id)
+        {
+            return _themes.ReadValueFromJson(id.ToString(), default(TerminalTheme));
+        }
 
-            if (newShell)
-            {
-                ShellProfileAdded?.Invoke(this, shellProfile);
-            }
+        public TerminalOptions GetTerminalOptions()
+        {
+            return _roamingSettings.ReadValueFromJson(nameof(TerminalOptions), _defaultValueProvider.GetDefaultTerminalOptions());
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
@@ -230,19 +104,80 @@ namespace FluentTerminal.App.Services.Implementation
             TerminalOptionsChanged?.Invoke(this, terminalOptions);
         }
 
-        public void SaveTheme(TerminalTheme theme, bool newTheme = false)
+        public ApplicationSettings GetApplicationSettings()
         {
-            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
+        }
 
-            if (theme.Id == GetCurrentThemeId())
+        public void SaveApplicationSettings(ApplicationSettings applicationSettings)
+        {
+            _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
+            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
+        }
+
+        public IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings()
+        {
+            var keyBindings = new Dictionary<Command, ICollection<KeyBinding>>();
+            foreach (var value in Enum.GetValues(typeof(Command)))
             {
-                CurrentThemeChanged?.Invoke(this, theme.Id);
+                var command = (Command)value;
+                keyBindings.Add(command, _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
             }
 
-            if (newTheme)
+            return keyBindings;
+        }
+
+        public void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings)
+        {
+            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
+            _roamingSettings.WriteValueAsJson(nameof(KeyBindings), keyBindings);
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+        }
+
+        public void ResetKeyBindings()
+        {
+            foreach (var value in Enum.GetValues(typeof(Command)))
             {
-                ThemeAdded?.Invoke(this, theme);
+                var command = (Command)value;
+                _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
             }
+
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+        }
+
+        public Guid GetDefaultShellProfileId()
+        {
+            if (_roamingSettings.TryGetValue(DefaultShellProfileKey, out object value))
+            {
+                return (Guid)value;
+            }
+            return _defaultValueProvider.GetDefaultShellProfileId();
+        }
+
+        public ShellProfile GetDefaultShellProfile()
+        {
+            var id = GetDefaultShellProfileId();
+            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
+        }
+
+        public void SaveDefaultShellProfileId(Guid id)
+        {
+            _roamingSettings.SetValue(DefaultShellProfileKey, id);
+        }
+
+        public IEnumerable<ShellProfile> GetShellProfiles()
+        {
+            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
+        }
+
+        public void SaveShellProfile(ShellProfile shellProfile)
+        {
+            _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+        }
+
+        public void DeleteShellProfile(Guid id)
+        {
+            _shellProfiles.Delete(id.ToString());
         }
     }
 }

FluentTerminal.App.Services/Implementation/ThemeParserFactory.cs

@@ -20,4 +20,4 @@ namespace FluentTerminal.App.Services.Implementation
             return _parsers.FirstOrDefault(p => p.SupportedFileTypes.Contains(fileType));
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,11 +1,10 @@
-using FluentTerminal.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Requests;
 using FluentTerminal.Models.Responses;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -13,86 +12,35 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
-        private readonly Dictionary<int, Action<byte[]>> _terminalOutputHandlers;
-        private int _nextTerminalId = 0;
-
-        public event EventHandler<int> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<int, Action<byte[]>>();
         }
 
-        public int GetNextTerminalId()
-        {
-            return _nextTerminalId++;
-        }
-
-        public async Task<GetAvailablePortResponse> GetAvailablePort()
-        {
-            var request = new GetAvailablePortRequest();
-
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>(responseMessage[MessageKeys.Content]);
-
-            Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
-
-            return response;
-        }
-
-        public async Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
+        public async Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile)
         {
             var request = new CreateTerminalRequest
             {
-                Id = id,
                 Size = size,
-                Profile = shellProfile,
-                SessionType = sessionType
+                Profile = shellProfile
             };
 
-            Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
+            var message = new Dictionary<string, string>
+            {
+                { MessageKeys.Type, MessageTypes.CreateTerminalRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
+            };
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
+            var responseMessage = await _appServiceConnection.SendMessageAsync(message);
 
-            Logger.Instance.Debug("Received CreateTerminalResponse: {@response}", response);
-
-            return response;
+            return JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
         }
 
-        public void Initialize(IAppServiceConnection appServiceConnection)
+        public Task Initialize(IAppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
-            _appServiceConnection.MessageReceived += OnMessageReceived;
-        }
-
-        private void OnMessageReceived(object sender, IDictionary<string, string> e)
-        {
-            var messageType = e[MessageKeys.Type];
-            var messageContent = e[MessageKeys.Content];
-
-            if (messageType == nameof(DisplayTerminalOutputRequest))
-            {
-                var request = JsonConvert.DeserializeObject<DisplayTerminalOutputRequest>(messageContent);
-
-                if (_terminalOutputHandlers.ContainsKey(request.TerminalId))
-                {
-                    _terminalOutputHandlers[request.TerminalId].Invoke(request.Output);
-                }
-                else
-                {
-                    Logger.Instance.Error("Received output for unknown terminal Id {id}", request.TerminalId);
-                }
-            }
-            else if (messageType == nameof(TerminalExitedRequest))
-            {
-                var request = JsonConvert.DeserializeObject<TerminalExitedRequest>(messageContent);
-
-                Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
-
-                TerminalExited?.Invoke(this, request.TerminalId);
-            }
+            return UpdateToggleWindowKeyBindings();
         }
 
         public Task ResizeTerminal(int id, TerminalSize size)
@@ -103,56 +51,31 @@ namespace FluentTerminal.App.Services.Implementation
                 NewSize = size
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
+            var message = new Dictionary<string, string>
+            {
+                { MessageKeys.Type, MessageTypes.ResizeTerminalRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
+            };
 
-        public void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback)
-        {
-            _terminalOutputHandlers[terminalId] = callback;
+            return _appServiceConnection.SendMessageAsync(message);
         }
 
         public Task UpdateToggleWindowKeyBindings()
         {
-            var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
+            var keyBindings = _settingsService.GetKeyBindings()[Command.ToggleWindow];
 
             var request = new SetToggleWindowKeyBindingsRequest
             {
                 KeyBindings = keyBindings
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        public Task Write(int id, byte[] data)
-        {
-            var request = new WriteDataRequest
+            var message = new Dictionary<string, string>
             {
-                TerminalId = id,
-                Data = data
+                { MessageKeys.Type, MessageTypes.SetToggleWindowKeyBindingsRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        public Task CloseTerminal(int terminalId)
-        {
-            var request = new TerminalExitedRequest
-            {
-                TerminalId = terminalId
-            };
-
-            Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
-
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        private IDictionary<string, string> CreateMessage(object content)
-        {
-            return new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = content.GetType().Name,
-                [MessageKeys.Content] = JsonConvert.SerializeObject(content)
-            };
+            return _appServiceConnection.SendMessageAsync(message);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/UpdateService.cs

@@ -1,56 +0,0 @@
-using System;
-using Windows.ApplicationModel;
-using Newtonsoft.Json;
-using RestSharp;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services.Implementation
-{
-    public class UpdateService : IUpdateService
-    {
-        private const string apiEndpoint = "https://api.github.com";
-
-        private readonly INotificationService _notificationService;
-
-        public UpdateService(INotificationService notificationService)
-        {
-            _notificationService = notificationService;
-        }
-
-        public async Task CheckForUpdate(bool notifyNoUpdate = false)
-        {
-            var latest = await GetLatestVersionAsync();
-            if (latest > GetCurrentVersion())
-            {
-                _notificationService.ShowNotification("Update available",
-                    "Click to open the releases page.", "https://github.com/felixse/FluentTerminal/releases");
-            }
-            else if (notifyNoUpdate)
-            {
-                _notificationService.ShowNotification("No update available", "You're up to date!");
-            }
-        }
-
-        public Version GetCurrentVersion()
-        {
-            var currentVersion = Package.Current.Id.Version;
-            return new Version(currentVersion.Major, currentVersion.Minor, currentVersion.Build, currentVersion.Revision);
-        }
-
-        public async Task<Version> GetLatestVersionAsync()
-        {
-            var restClient = new RestClient(apiEndpoint);
-            var restRequest = new RestRequest("/repos/felixse/fluentterminal/releases", Method.GET);
-
-            var restResponse = await restClient.ExecuteTaskAsync(restRequest);
-            if (restResponse.IsSuccessful)
-            {
-                dynamic restResponseData = JsonConvert.DeserializeObject(restResponse.Content);
-                string tag = restResponseData[0].tag_name;
-                var latestVersion = new Version(tag);
-                return new Version(latestVersion.Major, latestVersion.Minor, latestVersion.Build, latestVersion.Revision);
-            }
-            return new Version(0, 0, 0, 0);
-        }
-    }
-}

FluentTerminal.App.Services/Logger.cs

@@ -1,66 +0,0 @@
-using Serilog;
-using Serilog.Events;
-using System;
-
-namespace FluentTerminal.App.Services
-{
-    public sealed class Logger
-    {
-        public enum LogLevel
-        {
-            Verbose = 0,
-            Debug = 1,
-            Information = 2,
-            Warning = 3,
-            Error = 4,
-            Fatal = 5
-        }
-
-        public class Configuration
-        {
-            public LogLevel LogLevel { get; set; } = LogLevel.Error;
-        }
-
-        public static Logger Instance { get; } = new Logger();
-
-        private Logger()
-        {
-
-        }
-
-        public void Initialize(string filePath, Configuration configuration)
-        {
-            Log.Logger = new LoggerConfiguration()
-            .WriteTo.Async(a => a.File(filePath, rollingInterval: RollingInterval.Day, retainedFileCountLimit: 7))
-            .MinimumLevel.Is((LogEventLevel)configuration.LogLevel)
-            .CreateLogger();
-
-            Log.Information("Initialized");
-        }
-
-        public void Debug(string text, params object[] propertyValues)
-        {
-            Log.Debug(text, propertyValues, propertyValues);
-        }
-
-        public void Information(string text, params object[] propertyValues)
-        {
-            Log.Information(text, propertyValues);
-        }
-
-        public void Warning(string text, params object[] propertyValues)
-        {
-            Log.Warning(text, propertyValues);
-        }
-
-        public void Error(string text, params object[] propertyValues)
-        {
-            Log.Error(text, propertyValues);
-        }
-
-        public void Error(Exception exception, string text, params object[] propertyValues)
-        {
-            Log.Error(exception, text, propertyValues);
-        }
-    }
-}

FluentTerminal.App.Services/Terminal.cs

@@ -1,144 +0,0 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using FluentTerminal.Models.Responses;
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services
-{
-    public class Terminal
-    {
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private Func<Task<string>> _selectedTextCallback;
-
-        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService)
-        {
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
-            Id = _trayProcessCommunicationService.GetNextTerminalId();
-        }
-
-        private void OnTerminalExited(object sender, int e)
-        {
-            if (e == Id)
-            {
-                Closed?.Invoke(this, System.EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// To be observed by both view and viewmodel
-        /// </summary>
-        public event EventHandler Closed;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<string> KeyboardCommandReceived;
-
-        /// <summary>
-        /// to be observed by view
-        /// </summary>
-        public event EventHandler<byte[]> OutputReceived;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<TerminalSize> SizeChanged;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<string> TitleChanged;
-
-        public string FallbackTitle { get; private set; }
-
-        public int Id { get; }
-
-        /// <summary>
-        /// To be called by either view or viewmodel
-        /// </summary>
-        public async Task Close()
-        {
-            await _trayProcessCommunicationService.CloseTerminal(Id).ConfigureAwait(true);
-        }
-
-        /// <summary>
-        /// to be called by viewmodel
-        /// </summary>
-        /// <returns></returns>
-        public Task<string> GetSelectedText()
-        {
-            return _selectedTextCallback();
-        }
-
-        /// <summary>
-        /// to be called by view
-        /// </summary>
-        public void ProcessKeyboardCommand(string command)
-        {
-            KeyboardCommandReceived?.Invoke(this, command);
-        }
-
-        /// <summary>
-        /// To be set by view
-        /// </summary>
-        public void RegisterSelectedTextCallback(Func<Task<string>> selectedTextCallback)
-        {
-            _selectedTextCallback = selectedTextCallback;
-        }
-
-        /// <summary>
-        /// To be called by view
-        /// </summary>
-        public async Task SetSize(TerminalSize size)
-        {
-            await _trayProcessCommunicationService.ResizeTerminal(Id, size);
-            SizeChanged?.Invoke(this, size);
-        }
-
-        /// <summary>
-        /// to be called by view
-        /// </summary>
-        public void SetTitle(string title)
-        {
-            if (string.IsNullOrWhiteSpace(title))
-            {
-                title = FallbackTitle;
-            }
-            TitleChanged?.Invoke(this, title);
-        }
-
-        /// <summary>
-        /// to be called by view when ready
-        /// </summary>
-        /// <param name="shellProfile"></param>
-        /// <param name="size"></param>
-        /// <param name="sessionType"></param>
-        public async Task<CreateTerminalResponse> StartShellProcess(ShellProfile shellProfile, TerminalSize size, SessionType sessionType)
-        {
-            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
-            var response = await _trayProcessCommunicationService.CreateTerminal(Id, size, shellProfile, sessionType).ConfigureAwait(true);
-
-            if (response.Success)
-            {
-                FallbackTitle = response.ShellExecutableName;
-                SetTitle(FallbackTitle);
-            }
-            return response;
-        }
-
-        public Task Write(byte[] data)
-        {
-            return _trayProcessCommunicationService.Write(Id, data);
-        }
-
-        /// <summary>
-        /// Tells the ViewModel that this view failed to launch and can be closed.
-        /// </summary>
-        public void ReportLauchFailed()
-        {
-            Closed?.Invoke(this, System.EventArgs.Empty);
-        }
-    }
-}

FluentTerminal.App.Services/Utilities/EnumHelper.cs

@@ -18,4 +18,4 @@ namespace FluentTerminal.App.Services.Utilities
             return value.ToString();
         }
     }
-}
+}

FluentTerminal.App.Services/Utilities/TerminalThemeContractResolver.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Services.Utilities
             return property;
         }
     }
-}
+}

FluentTerminal.App.ViewModels/FluentTerminal.App.ViewModels.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Fleck" Version="1.0.3" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1" />
   </ItemGroup>
 
   <ItemGroup>

FluentTerminal.App.ViewModels/Infrastructure/AsyncCommand.cs

@@ -1,124 +0,0 @@
-using FluentTerminal.App.ViewModels.Utilities;
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace FluentTerminal.App.ViewModels.Infrastructure
-{
-    public class AsyncCommand : IAsyncCommand
-    {
-        public event EventHandler CanExecuteChanged;
-
-        private bool _isExecuting;
-        private readonly Func<Task> _execute;
-        private readonly Func<bool> _canExecute;
-        private readonly IErrorHandler _errorHandler;
-
-        public AsyncCommand(
-            Func<Task> execute,
-            Func<bool> canExecute = null,
-            IErrorHandler errorHandler = null)
-        {
-            _execute = execute;
-            _canExecute = canExecute;
-            _errorHandler = errorHandler;
-        }
-
-        public bool CanExecute()
-        {
-            return !_isExecuting && (_canExecute?.Invoke() ?? true);
-        }
-
-        public async Task ExecuteAsync()
-        {
-            if (CanExecute())
-            {
-                try
-                {
-                    _isExecuting = true;
-                    await _execute();
-                }
-                finally
-                {
-                    _isExecuting = false;
-                }
-            }
-
-            RaiseCanExecuteChanged();
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        #region Explicit implementations
-        bool ICommand.CanExecute(object parameter)
-        {
-            return CanExecute();
-        }
-
-        void ICommand.Execute(object parameter)
-        {
-            ExecuteAsync().FireAndForgetSafeAsync(_errorHandler);
-        }
-        #endregion
-    }
-
-    public class AsyncCommand<T> : IAsyncCommand<T>
-    {
-        public event EventHandler CanExecuteChanged;
-
-        private bool _isExecuting;
-        private readonly Func<T, Task> _execute;
-        private readonly Func<T, bool> _canExecute;
-        private readonly IErrorHandler _errorHandler;
-
-        public AsyncCommand(Func<T, Task> execute, Func<T, bool> canExecute = null, IErrorHandler errorHandler = null)
-        {
-            _execute = execute;
-            _canExecute = canExecute;
-            _errorHandler = errorHandler;
-        }
-
-        public bool CanExecute(T parameter)
-        {
-            return !_isExecuting && (_canExecute?.Invoke(parameter) ?? true);
-        }
-
-        public async Task ExecuteAsync(T parameter)
-        {
-            if (CanExecute(parameter))
-            {
-                try
-                {
-                    _isExecuting = true;
-                    await _execute(parameter);
-                }
-                finally
-                {
-                    _isExecuting = false;
-                }
-            }
-
-            RaiseCanExecuteChanged();
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        #region Explicit implementations
-        bool ICommand.CanExecute(object parameter)
-        {
-            return CanExecute((T)parameter);
-        }
-
-        void ICommand.Execute(object parameter)
-        {
-            ExecuteAsync((T)parameter).FireAndForgetSafeAsync(_errorHandler);
-        }
-        #endregion
-    }
-}

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

@@ -1,20 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace FluentTerminal.App.ViewModels.Infrastructure
-{
-    /// <summary>
-    /// based on: https://github.com/johnthiriet/AsyncVoid
-    /// </summary>
-    public interface IAsyncCommand : ICommand
-    {
-        Task ExecuteAsync();
-        bool CanExecute();
-    }
-
-    public interface IAsyncCommand<T> : ICommand
-    {
-        Task ExecuteAsync(T parameter);
-        bool CanExecute(T parameter);
-    }
-}

FluentTerminal.App.ViewModels/Infrastructure/IErrorHandler.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace FluentTerminal.App.ViewModels.Infrastructure
-{
-    public interface IErrorHandler
-    {
-        void HandleError(Exception ex);
-    }
-}

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -6,144 +6,78 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
-using FluentTerminal.App.Services.Implementation;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        private readonly IClipboardService _clipboardService;
         private readonly IDialogService _dialogService;
-        private readonly IDispatcherTimer _dispatcherTimer;
         private readonly IKeyboardCommandService _keyboardCommandService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private readonly IDefaultValueProvider _defaultValueProvider;
         private ApplicationSettings _applicationSettings;
         private string _background;
         private double _backgroundOpacity;
+        private int _nextTerminalId;
         private TerminalViewModel _selectedTerminal;
-        private TabsPosition _tabsPosition;
-        private string _windowTitle;
+        private string _title;
+        private readonly IApplicationView _applicationView;
+        private readonly IDispatcherTimer _dispatcherTimer;
+        private readonly IClipboardService _clipboardService;
+
+        public event EventHandler Closed;
+        public event EventHandler NewWindowRequested;
+        public event EventHandler ShowSettingsRequested;
 
         public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, IDefaultValueProvider defaultValueProvider)
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
             _settingsService = settingsService;
             _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
             _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _settingsService.ShellProfileAdded += OnShellProfileAdded;
-            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
-
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _dialogService = dialogService;
-            ApplicationView = applicationView;
+            _applicationView = applicationView;
             _dispatcherTimer = dispatcherTimer;
             _clipboardService = clipboardService;
-            _defaultValueProvider = defaultValueProvider;
             _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), () => AddTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewRemoteTab), () => AddRemoteTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), () => AddConfigurableTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), () => SelectedTerminal.EditTitle());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
-
-            // Add all of the commands for switching to a tab of a given ID, if there's one open there
-            for (int i = 0; i < 9; i++)
-            {
-                var switchCmd = Command.SwitchToTerm1 + i;
-                int tabNumber = i;
-                void handler() => SelectTabNumber(tabNumber);
-                _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
-            }
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NextTab), SelectNextTab);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.PreviousTab), SelectPreviousTab);
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), () => NewWindow(false));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(true));
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
-
-            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
-            {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.Id));
-            }
-
+            _keyboardCommandService.RegisterCommandHandler(Command.NewTab, () => AddTerminal(null, false));
+            _keyboardCommandService.RegisterCommandHandler(Command.ConfigurableNewTab, () => AddTerminal(null, true));
+            _keyboardCommandService.RegisterCommandHandler(Command.CloseTab, CloseCurrentTab);
+            _keyboardCommandService.RegisterCommandHandler(Command.NextTab, SelectNextTab);
+            _keyboardCommandService.RegisterCommandHandler(Command.PreviousTab, SelectPreviousTab);
+            _keyboardCommandService.RegisterCommandHandler(Command.NewWindow, NewWindow);
+            _keyboardCommandService.RegisterCommandHandler(Command.ShowSettings, ShowSettings);
+            _keyboardCommandService.RegisterCommandHandler(Command.ToggleFullScreen, ToggleFullScreen);
             var currentTheme = _settingsService.GetCurrentTheme();
             var options = _settingsService.GetTerminalOptions();
             Background = currentTheme.Colors.Background;
             BackgroundOpacity = options.BackgroundOpacity;
             _applicationSettings = _settingsService.GetApplicationSettings();
-            TabsPosition = _applicationSettings.TabsPosition;
 
-            AddTerminalCommand = new RelayCommand(() => AddTerminal());
-            ShowAboutCommand = new RelayCommand(ShowAbout);
+            AddTerminalCommand = new RelayCommand(() => AddTerminal(null, false));
             ShowSettingsCommand = new RelayCommand(ShowSettings);
 
-            ApplicationView.CloseRequested += OnCloseRequest;
-            ApplicationView.Closed += OnClosed;
             Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+
+            Title = "Fluent Terminal";
+
+            _applicationView.CloseRequested += OnCloseRequest;
         }
 
-        private void OnClosed(object sender, EventArgs e)
+        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            Closed?.Invoke(this, e);
+            await _applicationView.RunOnDispatcherThread(() =>
+            {
+                BackgroundOpacity = e.BackgroundOpacity;
+            });
         }
 
-        private void OnShellProfileDeleted(object sender, Guid e)
-        {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
-        }
-
-        private void OnShellProfileAdded(object sender, ShellProfile e)
-        {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.Id));
-        }
-
-        private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            RaisePropertyChanged(nameof(ShowTabsOnTop));
-            RaisePropertyChanged(nameof(ShowTabsOnBottom));
-        }
-
-        public event EventHandler Closed;
-
-        public event EventHandler<NewWindowRequestedEventArgs> NewWindowRequested;
-
-        public event EventHandler ShowSettingsRequested;
-
-        public event EventHandler ShowAboutRequested;
-
         public RelayCommand AddTerminalCommand { get; }
 
-        public string WindowTitle
-        {
-            get => _windowTitle;
-            set
-            {
-                if (Set(ref _windowTitle, value))
-                {
-                    ApplicationView.Title = value;
-                }
-            }
-        }
-
-        public bool ShowTabsOnTop
-        {
-            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
-        public bool ShowTabsOnBottom
-        {
-            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
         public string Background
         {
             get => _background;
@@ -171,143 +105,55 @@ namespace FluentTerminal.App.ViewModels
                     if (SelectedTerminal != null)
                     {
                         SelectedTerminal.IsSelected = true;
-                        if (_applicationSettings.ShowCustomTitleInTitlebar)
-                        {
-                            WindowTitle = SelectedTerminal.TabTitle;
-                        }
-                        else
-                        {
-                            WindowTitle = SelectedTerminal.ShellTitle;
-                        }
                     }
                 }
             }
         }
 
-        public RelayCommand ShowAboutCommand { get; }
-
         public RelayCommand ShowSettingsCommand { get; }
 
-        public TabsPosition TabsPosition
-        {
-            get => _tabsPosition;
-            set => Set(ref _tabsPosition, value);
-        }
-
         public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
 
-        public IApplicationView ApplicationView { get; }
-
-        public Task AddConfigurableTerminal()
+        public string Title
         {
-            return ApplicationView.RunOnDispatcherThread(async () =>
+            get => _title;
+            set => Set(ref _title, value);
+        }
+
+        public Task AddTerminal(string startupDirectory, bool showProfileSelection)
+        {
+            return _applicationView.RunOnDispatcherThread(async () =>
             {
-                var profile = await _dialogService.ShowProfileSelectionDialogAsync();
-
-                if (profile == null)
+                ShellProfile profile = null;
+                if (showProfileSelection)
                 {
-                    if (Terminals.Count == 0)
-                    {
-                        await ApplicationView.TryClose();
-                    }
+                    profile = await _dialogService.ShowProfileSelectionDialogAsync();
 
-                    return;
+                    if (profile == null)
+                    {
+                        return;
+                    }
+                }
+                else
+                {
+                    profile = _settingsService.GetDefaultShellProfile();
                 }
 
-                AddTerminal(profile);
-            });
-        }
-
-        public Task AddRemoteTerminal()
-        {
-            return ApplicationView.RunOnDispatcherThread(async () =>
-            {
-                var connectionInfo = await _dialogService.ShowSshConnectionInfoDialogAsync();
-
-                if (connectionInfo == null)
-                {
-                    if (Terminals.Count == 0)
-                    {
-                        await ApplicationView.TryClose();
-                    }
-
-                    return;
-                }
-
-                var profile = new ShellProfile
-                {
-                    Arguments = $"-p {connectionInfo.Port:#####} {connectionInfo.Username}@{connectionInfo.Host}",
-                    Location = @"C:\Windows\System32\OpenSSH\ssh.exe",
-                    WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
-                };
-
-                AddTerminal(profile);
-            });
-        }
-
-        public void AddTerminal()
-        {
-            var profile = _settingsService.GetDefaultShellProfile();
-            AddTerminal(profile);
-        }
-
-        public void AddTerminal(Guid shellProfileId)
-        {
-            var profile = _settingsService.GetShellProfile(shellProfileId);
-            AddTerminal(profile);
-        }
-
-        public void AddTerminal(ShellProfile profile)
-        {
-            ApplicationView.RunOnDispatcherThread(() =>
-            {
-                var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
-
-                terminal.Closed += OnTerminalClosed;
-                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
+                var terminal = new TerminalViewModel(GetNextTerminalId(), _settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
+                    _applicationSettings, startupDirectory, profile, _applicationView, _dispatcherTimer, _clipboardService);
+                terminal.CloseRequested += OnTerminalCloseRequested;
+                terminal.TitleChanged += OnTitleChanged;
                 Terminals.Add(terminal);
 
                 SelectedTerminal = terminal;
             });
         }
 
-        private void Terminal_CustomTitleChanged(object sender, string e)
-        {
-            if (sender is TerminalViewModel terminal)
-            {
-                if (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
-                {
-                    if (string.IsNullOrWhiteSpace(e))
-                    {
-                        WindowTitle = terminal.ShellTitle;
-                    }
-                    else
-                    {
-                        WindowTitle = e;
-                    }
-                }
-            }
-        }
-
-        private void Terminal_ShellTitleChanged(object sender, string e)
-        {
-            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
-            {
-                WindowTitle = e;
-            }
-        }
-
-        public async Task CloseAllTerminals()
+        public void CloseAllTerminals()
         {
             foreach (var terminal in Terminals)
             {
-                terminal.Closed -= OnTerminalClosed;
-                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
-                await terminal.Close();
+                terminal.CloseView();
             }
         }
 
@@ -316,34 +162,19 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal?.CloseCommand.Execute(null);
         }
 
-        private void NewWindow(bool showProfileSelection)
+        private int GetNextTerminalId()
         {
-            var args = new NewWindowRequestedEventArgs
-            {
-                ShowProfileSelection = showProfileSelection
-            };
+            return _nextTerminalId++;
+        }
 
-            NewWindowRequested?.Invoke(this, args);
+        private void NewWindow()
+        {
+            NewWindowRequested?.Invoke(this, EventArgs.Empty);
         }
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
-            {
-                _applicationSettings = e;
-                TabsPosition = e.TabsPosition;
-                RaisePropertyChanged(nameof(ShowTabsOnTop));
-                RaisePropertyChanged(nameof(ShowTabsOnBottom));
-
-                if (e.ShowCustomTitleInTitlebar)
-                {
-                    WindowTitle = SelectedTerminal?.TabTitle;
-                }
-                else
-                {
-                    WindowTitle = SelectedTerminal?.ShellTitle;
-                }
-            });
+            await _applicationView.RunOnDispatcherThread(() => _applicationSettings = e);
         }
 
         private async Task OnCloseRequest(object sender, CancelableEventArgs e)
@@ -354,7 +185,8 @@ namespace FluentTerminal.App.ViewModels
 
                 if (result == DialogButton.OK)
                 {
-                    await CloseAllTerminals();
+                    CloseAllTerminals();
+                    Closed?.Invoke(this, EventArgs.Empty);
                 }
                 else
                 {
@@ -363,50 +195,52 @@ namespace FluentTerminal.App.ViewModels
             }
             else
             {
-                await CloseAllTerminals();
+                CloseAllTerminals();
+                Closed?.Invoke(this, EventArgs.Empty);
             }
         }
 
         private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
+            await _applicationView.RunOnDispatcherThread(() =>
              {
                  var currentTheme = _settingsService.GetTheme(e);
                  Background = currentTheme.Colors.Background;
              });
         }
 
-        private async void OnTerminalClosed(object sender, EventArgs e)
+        private void OnTerminalCloseRequested(object sender, EventArgs e)
         {
             if (sender is TerminalViewModel terminal)
             {
+                terminal.CloseView();
                 if (SelectedTerminal == terminal)
                 {
                     SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
                 }
-                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
                 Terminals.Remove(terminal);
 
                 if (Terminals.Count == 0)
                 {
-                    await ApplicationView.TryClose();
+                    Closed?.Invoke(this, EventArgs.Empty);
+                    _applicationView.TryClose();
                 }
             }
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
+            if (Terminals.Any())
             {
-                BackgroundOpacity = e.BackgroundOpacity;
-            });
+                Title = Terminals.First().Title;
+            }
         }
 
-        private void SelectTabNumber(int tabNumber)
+        private void OnTitleChanged(object sender, string e)
         {
-            if (tabNumber < Terminals.Count)
+            if (sender is TerminalViewModel terminal && Terminals.First() == terminal)
             {
-                SelectedTerminal = Terminals[tabNumber];
+                Title = e;
             }
         }
 
@@ -424,19 +258,14 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        private void ShowAbout()
-        {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
-        }
-
         private void ShowSettings()
         {
             ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
         }
-
+      
         private void ToggleFullScreen()
         {
-            ApplicationView.ToggleFullScreen();
+            _applicationView.ToggleFullScreen();
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

@@ -1,79 +0,0 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using GalaSoft.MvvmLight;
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels.Settings
-{
-    public class AboutPageViewModel : ViewModelBase
-    {
-        private const string BaseUrl = "https://github.com/felixse/FluentTerminal/releases/tag/";
-        private readonly ISettingsService _settingsService;
-        private readonly IUpdateService _updateService;
-        private string _latestVersion;
-        private readonly IApplicationView _applicationView;
-
-        public AboutPageViewModel(ISettingsService settingsService, IUpdateService updateService, IApplicationView applicationView)
-        {
-            _settingsService = settingsService;
-            _updateService = updateService;
-            _applicationView = applicationView;
-
-            CheckForUpdatesCommand = new AsyncCommand(() => CheckForUpdate(true));
-        }
-
-        public IAsyncCommand CheckForUpdatesCommand { get; }
-
-        public string CurrentVersion
-        {
-            get
-            {
-                var version = _updateService.GetCurrentVersion();
-                return ConvertVersionToString(version);
-            }
-        }
-
-        public string CurrentVersionReleaseNotesURL => BaseUrl + CurrentVersion;
-
-        public string LatestVersion
-        {
-            get => _latestVersion;
-            set
-            {
-                if (Set(ref _latestVersion, value))
-                {
-                    RaisePropertyChanged(nameof(LatestVersionFound));
-                    RaisePropertyChanged(nameof(LatestVersionLoading));
-                    RaisePropertyChanged(nameof(LatestVersionNotFound));
-                    RaisePropertyChanged(nameof(LatestVersionReleaseNotesURL));
-                }
-            }
-        }
-
-        public bool LatestVersionFound => !LatestVersionNotFound && !LatestVersionLoading;
-
-        public bool LatestVersionLoading => LatestVersion == null;
-
-        public bool LatestVersionNotFound => LatestVersion == "0.0.0.0";
-
-        public string LatestVersionReleaseNotesURL => BaseUrl + LatestVersion;
-
-        public Task OnNavigatedTo()
-        {
-            return CheckForUpdate(false);
-        }
-
-        public async Task CheckForUpdate(bool notifyNoUpdate)
-        {
-            var version = ConvertVersionToString(await _updateService.GetLatestVersionAsync());
-            await _applicationView.RunOnDispatcherThread(() => LatestVersion = version);
-            await _updateService.CheckForUpdate(notifyNoUpdate);
-        }
-
-        private string ConvertVersionToString(Version version)
-        {
-            return string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-        }
-    }
-}

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -9,128 +9,22 @@ namespace FluentTerminal.App.ViewModels.Settings
 {
     public class GeneralPageViewModel : ViewModelBase
     {
-        private readonly ApplicationSettings _applicationSettings;
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
-        private readonly IStartupTaskService _startupTaskService;
-        private bool _canEnableStartupTask;
+        private readonly ApplicationSettings _applicationSettings;
         private bool _editingNewTerminalLocation;
-        private bool _editingTabsPosition;
-        private bool _editingInactiveTabColorMode;
-        private bool _startupTaskEnabled;
-        private bool _shouldRestartForTrayMessage;
-        private string _startupTaskErrorMessage;
 
-        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
-            _startupTaskService = startupTaskService;
-
             _applicationSettings = _settingsService.GetApplicationSettings();
 
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
         }
 
-        public async Task OnNavigatedTo()
-        {
-            var startupTaskStatus = await _startupTaskService.GetStatus();
-            SetStartupTaskPropertiesForStatus(startupTaskStatus);
-        }
-
-        public bool AlwaysShowTabs
-        {
-            get => _applicationSettings.AlwaysShowTabs;
-            set
-            {
-                if (_applicationSettings.AlwaysShowTabs != value)
-                {
-                    _applicationSettings.AlwaysShowTabs = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool AlwaysUseWinPty
-        {
-            get => _applicationSettings.AlwaysUseWinPty;
-            set
-            {
-                if (_applicationSettings.AlwaysUseWinPty != value)
-                {
-                    _applicationSettings.AlwaysUseWinPty = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool ShowCustomTitleInTitlebar
-        {
-            get => _applicationSettings.ShowCustomTitleInTitlebar;
-            set
-            {
-                if (_applicationSettings.ShowCustomTitleInTitlebar != value)
-                {
-                    _applicationSettings.ShowCustomTitleInTitlebar = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool EnableTrayIcon
-        {
-            get => _applicationSettings.EnableTrayIcon;
-            set
-            {
-                if (_applicationSettings.EnableTrayIcon != value)
-                {
-                    _applicationSettings.EnableTrayIcon = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-
-                    // Toggle message telling user to restart the program
-                    ShouldRestartForTrayMessage = !ShouldRestartForTrayMessage;
-                }
-            }
-        }
-
-        public bool ShouldRestartForTrayMessage
-        {
-            get => _shouldRestartForTrayMessage;
-            set => Set(ref _shouldRestartForTrayMessage, value);
-        }
-
-        public bool ShowNewOutputIndicator
-        {
-            get => _applicationSettings.ShowNewOutputIndicator;
-            set
-            {
-                if (_applicationSettings.ShowNewOutputIndicator != value)
-                {
-                    _applicationSettings.ShowNewOutputIndicator = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool BottomIsSelected
-        {
-            get => TabsPosition == TabsPosition.Bottom;
-            set => TabsPosition = TabsPosition.Bottom;
-        }
-
-        public bool CanEnableStartupTask
-        {
-            get => _canEnableStartupTask;
-            set => Set(ref _canEnableStartupTask, value);
-        }
-
         public bool ConfirmClosingTabs
         {
             get => _applicationSettings.ConfirmClosingTabs;
@@ -159,6 +53,20 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public bool UnderlineSelectedTab
+        {
+            get => _applicationSettings.UnderlineSelectedTab;
+            set
+            {
+                if (_applicationSettings.UnderlineSelectedTab != value)
+                {
+                    _applicationSettings.UnderlineSelectedTab = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public NewTerminalLocation NewTerminalLocation
         {
             get => _applicationSettings.NewTerminalLocation;
@@ -179,100 +87,12 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand RestoreDefaultsCommand { get; }
 
-        public bool StartupTaskEnabled
-        {
-            get => _startupTaskEnabled;
-            set
-            {
-                if (_startupTaskEnabled != value)
-                {
-                    _startupTaskEnabled = value;
-                    RaisePropertyChanged(nameof(StartupTaskEnabled));
-                    SetStartupTaskState(value);
-                }
-            }
-        }
-
-        public string StartupTaskErrorMessage
-        {
-            get => _startupTaskErrorMessage;
-            set => Set(ref _startupTaskErrorMessage, value);
-        }
-
         public bool TabIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Tab;
             set => NewTerminalLocation = NewTerminalLocation.Tab;
         }
 
-        public TabsPosition TabsPosition
-        {
-            get => _applicationSettings.TabsPosition;
-            set
-            {
-                if (_applicationSettings.TabsPosition != value && !_editingTabsPosition)
-                {
-                    _editingTabsPosition = true;
-                    _applicationSettings.TabsPosition = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(TopIsSelected));
-                    RaisePropertyChanged(nameof(BottomIsSelected));
-                    _editingTabsPosition = false;
-                }
-            }
-        }
-
-        public bool TopIsSelected
-        {
-            get => TabsPosition == TabsPosition.Top;
-            set => TabsPosition = TabsPosition.Top;
-        }
-
-        public bool UnderlineSelectedTab
-        {
-            get => _applicationSettings.UnderlineSelectedTab;
-            set
-            {
-                if (_applicationSettings.UnderlineSelectedTab != value)
-                {
-                    _applicationSettings.UnderlineSelectedTab = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool BackgroundIsSelected
-        {
-            get => InactiveTabColorMode == InactiveTabColorMode.Background;
-            set => InactiveTabColorMode = InactiveTabColorMode.Background;
-        }
-
-        public bool UnderlinedIsSelected
-        {
-            get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
-            set => InactiveTabColorMode = InactiveTabColorMode.Underlined;
-        }
-
-        public InactiveTabColorMode InactiveTabColorMode
-        {
-            get => _applicationSettings.InactiveTabColorMode;
-            set
-            {
-                if (_applicationSettings.InactiveTabColorMode != value && !_editingInactiveTabColorMode)
-                {
-                    _editingInactiveTabColorMode = true;
-                    _applicationSettings.InactiveTabColorMode = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(BackgroundIsSelected));
-                    RaisePropertyChanged(nameof(UnderlinedIsSelected));
-                    _editingInactiveTabColorMode = false;
-                }
-            }
-        }
-
         public bool WindowIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Window;
@@ -281,7 +101,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
 
             if (result == DialogButton.OK)
             {
@@ -289,59 +109,8 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ConfirmClosingWindows = defaults.ConfirmClosingWindows;
                 ConfirmClosingTabs = defaults.ConfirmClosingTabs;
                 UnderlineSelectedTab = defaults.UnderlineSelectedTab;
-                InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
-                AlwaysShowTabs = defaults.AlwaysShowTabs;
-                AlwaysUseWinPty = defaults.AlwaysUseWinPty;
-                ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
-                EnableTrayIcon = defaults.EnableTrayIcon;
-                ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
             }
         }
-
-        private void SetStartupTaskPropertiesForStatus(StartupTaskStatus startupTaskStatus)
-        {
-            switch (startupTaskStatus)
-            {
-                case StartupTaskStatus.Enabled:
-                    StartupTaskEnabled = true;
-                    StartupTaskErrorMessage = string.Empty;
-                    CanEnableStartupTask = true;
-                    break;
-
-                case StartupTaskStatus.Disabled:
-                    StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = string.Empty;
-                    CanEnableStartupTask = true;
-                    break;
-
-                case StartupTaskStatus.DisabledByUser:
-                    StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager.";
-                    CanEnableStartupTask = false;
-                    break;
-
-                case StartupTaskStatus.DisabledByPolicy:
-                    StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = "Disabled by policy.";
-                    CanEnableStartupTask = false;
-                    break;
-            }
-        }
-
-        private async Task SetStartupTaskState(bool enabled)
-        {
-            StartupTaskStatus status;
-            if (enabled)
-            {
-                status = await _startupTaskService.EnableStartupTask();
-            }
-            else
-            {
-                _startupTaskService.DisableStartupTask();
-                status = await _startupTaskService.GetStatus();
-            }
-            SetStartupTaskPropertiesForStatus(status);
-        }
     }
 }

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

@@ -1,7 +1,7 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
 using System;
 using System.Threading.Tasks;
 
@@ -11,21 +11,18 @@ namespace FluentTerminal.App.ViewModels.Settings
     {
         private readonly IDialogService _dialogService;
 
-        public KeyBindingViewModel(KeyBinding keyBinding, IDialogService dialogService, KeyBindingsViewModel parent)
+        public KeyBindingViewModel(KeyBinding keyBinding, IDialogService dialogService)
         {
             Model = keyBinding;
-            Parent = parent;
             _dialogService = dialogService;
-            EditCommand = new AsyncCommand(Edit);
-            DeleteCommand = new AsyncCommand(Delete);
+            EditCommand = new RelayCommand(async () => await Edit().ConfigureAwait(false));
+            DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false));
         }
 
         public event EventHandler Deleted;
 
         public event EventHandler Edited;
 
-        public KeyBindingsViewModel Parent { get; }
-
         public bool Meta
         {
             get => Model.Meta;
@@ -65,8 +62,8 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public IAsyncCommand DeleteCommand { get; }
-        public IAsyncCommand EditCommand { get; }
+        public RelayCommand DeleteCommand { get; }
+        public RelayCommand EditCommand { get; }
 
         public int Key
         {

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -18,7 +17,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private IDictionary<string, ICollection<KeyBinding>> _keyBindings;
+        private IDictionary<Command, ICollection<KeyBinding>> _keyBindings;
 
         public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
@@ -27,19 +26,19 @@ namespace FluentTerminal.App.ViewModels.Settings
             _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
-            AddCommand = new RelayCommand<string>(async command => await Add(command).ConfigureAwait(false));
+            AddCommand = new RelayCommand<Command>(async command => await Add(command).ConfigureAwait(false));
 
-            Initialize(_settingsService.GetCommandKeyBindings());
+            Initialize(_settingsService.GetKeyBindings());
         }
 
-        public RelayCommand<string> AddCommand { get; }
+        public RelayCommand<Command> AddCommand { get; }
         public ObservableCollection<KeyBindingsViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingsViewModel>();
         public RelayCommand RestoreDefaultsCommand { get; }
 
-        private async Task Add(string command)
+        private async Task Add(Command command)
         {
             var keyBinding = KeyBindings.FirstOrDefault(k => k.Command == command);
-            await keyBinding?.ShowAddKeyBindingDialog();
+            await keyBinding?.Add();
         }
 
         private void ClearKeyBindings()
@@ -52,7 +51,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             KeyBindings.Clear();
         }
 
-        private void Initialize(IDictionary<string, ICollection<KeyBinding>> keyBindings)
+        private void Initialize(IDictionary<Command, ICollection<KeyBinding>> keyBindings)
         {
             _keyBindings = keyBindings;
 
@@ -61,17 +60,13 @@ namespace FluentTerminal.App.ViewModels.Settings
             foreach (var value in Enum.GetValues(typeof(Command)))
             {
                 var command = (Command)value;
-                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true);
-                foreach (var keyBinding in _keyBindings[command.ToString()])
-                {
-                    viewModel.Add(keyBinding);
-                }
+                var viewModel = new KeyBindingsViewModel(command, _keyBindings[command], _dialogService);
                 viewModel.Edited += OnEdited;
                 KeyBindings.Add(viewModel);
             }
         }
 
-        private void OnEdited(string command, ICollection<KeyBinding> keyBindings)
+        private void OnEdited(Command command, ICollection<KeyBinding> keyBindings)
         {
             _settingsService.SaveKeyBindings(command, keyBindings);
             _trayProcessCommunicationService.UpdateToggleWindowKeyBindings();
@@ -84,7 +79,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             if (result == DialogButton.OK)
             {
                 _settingsService.ResetKeyBindings();
-                Initialize(_settingsService.GetCommandKeyBindings());
+                Initialize(_settingsService.GetKeyBindings());
             }
         }
     }

FluentTerminal.App.ViewModels/Settings/KeyBindingsViewModel.cs

@@ -1,10 +1,11 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -12,73 +13,62 @@ namespace FluentTerminal.App.ViewModels.Settings
     public class KeyBindingsViewModel : ViewModelBase
     {
         private readonly IDialogService _dialogService;
-        private bool _editable;
+        private readonly ICollection<KeyBinding> _keyBindings;
 
-        public KeyBindingsViewModel(string command, IDialogService dialogService, string commandName, bool editable)
+        public KeyBindingsViewModel(Command command, ICollection<KeyBinding> keyBindings, IDialogService dialogService)
         {
+            Command = command;
+            _keyBindings = keyBindings;
             _dialogService = dialogService;
 
-            Command = command;
-            CommandName = commandName;
-            Editable = editable;
-        }
+            CommandName = EnumHelper.GetEnumDescription(command);
 
-        public delegate void EditedEvent(string command, ICollection<KeyBinding> keyBindings);
-
-        public event EditedEvent Edited;
-
-        public string Command { get; }
-
-        public string CommandName { get; }
-
-        /// <summary>
-        ///  Whether or not the "Edit" and "Delete" links appear next to the key binding list.
-        /// </summary>
-        public bool Editable
-        {
-            get => _editable;
-            set => Set(ref _editable, value);
-        }
-
-        public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
-
-        public async Task ShowAddKeyBindingDialog()
-        {
-            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
-
-            if (await newKeyBinding.Edit().ConfigureAwait(true))
+            foreach (var binding in keyBindings)
             {
-                Add(newKeyBinding.Model);
+                var viewModel = new KeyBindingViewModel(binding, _dialogService);
+                viewModel.Deleted += ViewModel_Deleted;
+                viewModel.Edited += ViewModel_Edited;
+                KeyBindings.Add(viewModel);
             }
         }
 
-        public void Clear()
-        {
-            KeyBindings.Clear();
-        }
+        public delegate void EditedEvent(Command command, ICollection<KeyBinding> keyBindings);
 
-        public void Add(KeyBinding keyBinding)
-        {
-            var viewModel = new KeyBindingViewModel(keyBinding, _dialogService, this);
+        public event EditedEvent Edited;
 
-            viewModel.Deleted += ViewModel_Deleted;
-            viewModel.Edited += ViewModel_Edited;
-            KeyBindings.Add(viewModel);
-            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+        public Command Command { get; }
+
+        public string CommandName { get; }
+
+        public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
+
+        public async Task Add()
+        {
+            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService);
+
+            if (await newKeyBinding.Edit().ConfigureAwait(true))
+            {
+                newKeyBinding.Deleted += ViewModel_Deleted;
+                newKeyBinding.Edited += ViewModel_Edited;
+                KeyBindings.Add(newKeyBinding);
+                _keyBindings.Add(newKeyBinding.Model);
+                Edited?.Invoke(Command, _keyBindings);
+            }
         }
 
         private void ViewModel_Deleted(object sender, EventArgs e)
         {
             if (sender is KeyBindingViewModel keyBinding)
             {
+                _keyBindings.Remove(keyBinding.Model);
                 KeyBindings.Remove(keyBinding);
-                Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+                Edited?.Invoke(Command, _keyBindings);
             }
         }
 
         private void ViewModel_Edited(object sender, EventArgs e)
         {
-            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+            Edited?.Invoke(Command, _keyBindings);
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs

@@ -1,135 +0,0 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels.Settings
-{
-    public class MousePageViewModel : ViewModelBase
-    {
-        private readonly ISettingsService _settingsService;
-        private readonly IDialogService _dialogService;
-        private readonly IDefaultValueProvider _defaultValueProvider;
-        private readonly ApplicationSettings _applicationSettings;
-        private bool _editingMouseRightClickAction;
-        private bool _editingMouseMiddleClickAction;
-
-        public MousePageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
-        {
-            _settingsService = settingsService;
-            _dialogService = dialogService;
-            _defaultValueProvider = defaultValueProvider;
-            _applicationSettings = _settingsService.GetApplicationSettings();
-
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
-        }
-
-        public bool CopyOnSelect
-        {
-            get => _applicationSettings.CopyOnSelect;
-            set
-            {
-                if (_applicationSettings.CopyOnSelect != value)
-                {
-                    _applicationSettings.CopyOnSelect = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public MouseAction MouseRightClickAction
-        {
-            get => _applicationSettings.MouseRightClickAction;
-            set
-            {
-                if (_applicationSettings.MouseRightClickAction != value && !_editingMouseRightClickAction)
-                {
-                    _editingMouseRightClickAction = true;
-                    _applicationSettings.MouseRightClickAction = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseRightClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickPasteIsSelected));
-                    _editingMouseRightClickAction = false;
-                }
-            }
-        }
-
-        public bool MouseRightClickNoneIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.None;
-            set => MouseRightClickAction = MouseAction.None;
-        }
-
-        public bool MouseRightClickContextMenuIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.ContextMenu;
-            set => MouseRightClickAction = MouseAction.ContextMenu;
-        }
-
-        public bool MouseRightClickPasteIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.Paste;
-            set => MouseRightClickAction = MouseAction.Paste;
-        }
-
-        public MouseAction MouseMiddleClickAction
-        {
-            get => _applicationSettings.MouseMiddleClickAction;
-            set
-            {
-                if (_applicationSettings.MouseMiddleClickAction != value && !_editingMouseMiddleClickAction)
-                {
-                    _editingMouseMiddleClickAction = true;
-                    _applicationSettings.MouseMiddleClickAction = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseMiddleClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickPasteIsSelected));
-                    _editingMouseMiddleClickAction = false;
-                }
-            }
-        }
-
-        public bool MouseMiddleClickNoneIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.None;
-            set => MouseMiddleClickAction = MouseAction.None;
-        }
-
-        public bool MouseMiddleClickContextMenuIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.ContextMenu;
-            set => MouseMiddleClickAction = MouseAction.ContextMenu;
-        }
-
-        public bool MouseMiddleClickPasteIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.Paste;
-            set => MouseMiddleClickAction = MouseAction.Paste;
-        }
-
-        public RelayCommand RestoreDefaultsCommand { get; }
-
-        private async Task RestoreDefaults()
-        {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                var defaults = _defaultValueProvider.GetDefaultApplicationSettings();
-                CopyOnSelect = defaults.CopyOnSelect;
-                MouseMiddleClickAction = defaults.MouseMiddleClickAction;
-                MouseRightClickAction = defaults.MouseRightClickAction;
-            }
-        }
-    }
-}

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -4,7 +4,6 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -16,23 +15,21 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IFileSystemService _fileSystemService;
         private ShellProfileViewModel _selectedShellProfile;
-        private readonly IApplicationView _applicationView;
+        
 
-        public ProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IFileSystemService fileSystemService, IApplicationView applicationView)
+        public ProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IFileSystemService fileSystemService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _fileSystemService = fileSystemService;
-            _applicationView = applicationView;
 
             CreateShellProfileCommand = new RelayCommand(CreateShellProfile);
-            CloneCommand = new RelayCommand<ShellProfileViewModel>(Clone);
 
             var defaultShellProfileId = _settingsService.GetDefaultShellProfileId();
             foreach (var shellProfile in _settingsService.GetShellProfiles())
             {
-                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService, applicationView, defaultValueProvider, false);
+                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService);
                 viewModel.Deleted += OnShellProfileDeleted;
                 viewModel.SetAsDefault += OnShellProfileSetAsDefault;
 
@@ -44,7 +41,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
 
             SelectedShellProfile = ShellProfiles.First(p => p.IsDefault);
-            
         }
 
         private void OnShellProfileSetAsDefault(object sender, EventArgs e)
@@ -81,38 +77,18 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand CreateShellProfileCommand { get; }
 
-        public RelayCommand<ShellProfileViewModel> CloneCommand { get; }
-
         private void CreateShellProfile()
         {
             var shellProfile = new ShellProfile
             {
                 Id = Guid.NewGuid(),
                 PreInstalled = false,
-                Name = "New profile",
-                KeyBindings = new List<KeyBinding>()
+                Name = "New profile"
             };
 
-            AddShellProfile(shellProfile);
-        }
+            _settingsService.SaveShellProfile(shellProfile);
 
-        private void Clone(ShellProfileViewModel shellProfile)
-        {
-            var cloned = new ShellProfile(shellProfile.Model)
-            {
-                Id = Guid.NewGuid(),
-                PreInstalled = false,
-                Name = $"Copy of {shellProfile.Name}"
-            };
-
-            AddShellProfile(cloned);
-        }
-
-        private void AddShellProfile(ShellProfile shellProfile)
-        {
-            _settingsService.SaveShellProfile(shellProfile, true);
-
-            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider, true);
+            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService);
             viewModel.EditCommand.Execute(null);
             viewModel.SetAsDefault += OnShellProfileSetAsDefault;
             viewModel.Deleted += OnShellProfileDeleted;

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -96,20 +96,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public int Padding
-        {
-            get => _terminalOptions.Padding;
-            set
-            {
-                if (_terminalOptions.Padding != value)
-                {
-                    _terminalOptions.Padding = value;
-                    _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public string ScrollBackLimit
         {
             get => _terminalOptions.ScrollBackLimit.ToString();
@@ -136,21 +122,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public bool BoldText
-        {
-            get => _terminalOptions.BoldText;
-            set
-            {
-                if (_terminalOptions.BoldText != value)
-                {
-                    _terminalOptions.BoldText = value;
-                    _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public IEnumerable<FontInfo> Fonts { get; }
+        public IEnumerable<string> Fonts { get; }
 
         public int FontSize
         {
@@ -220,7 +192,6 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ScrollBarStyle = defaults.ScrollBarStyle;
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
-                BoldText = defaults.BoldText;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
             }
@@ -234,10 +205,10 @@ namespace FluentTerminal.App.ViewModels.Settings
 
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
 
-            Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s.Name);
+            Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s);
             Sizes = Enumerable.Range(1, 72);
 
             _terminalOptions = _settingsService.GetTerminalOptions();
         }
     }
-}
+}

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -31,7 +31,6 @@ namespace FluentTerminal.App.ViewModels.Settings
 
             CreateThemeCommand = new RelayCommand(CreateTheme);
             ImportThemeCommand = new RelayCommand(ImportTheme);
-            CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
 
@@ -40,7 +39,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             var activeThemeId = _settingsService.GetCurrentThemeId();
             foreach (var theme in _settingsService.GetThemes())
             {
-                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService, false);
+                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService);
                 viewModel.Activated += OnThemeActivated;
                 viewModel.Deleted += OnThemeDeleted;
 
@@ -56,7 +55,6 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand CreateThemeCommand { get; }
         public RelayCommand ImportThemeCommand { get; }
-        public RelayCommand<ThemeViewModel> CloneCommand { get; set; }
 
         public double BackgroundOpacity
         {
@@ -83,18 +81,6 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public ObservableCollection<ThemeViewModel> Themes { get; } = new ObservableCollection<ThemeViewModel>();
 
-        private void CloneTheme(ThemeViewModel theme)
-        {
-            var cloned = new TerminalTheme(theme.Model)
-            {
-                Id = Guid.NewGuid(),
-                PreInstalled = false,
-                Name = $"Copy of {theme.Name}"
-            };
-
-            AddTheme(cloned);
-        }
-
         private void CreateTheme()
         {
             var defaultTheme = _settingsService.GetTheme(_defaultValueProvider.GetDefaultThemeId());
@@ -106,7 +92,13 @@ namespace FluentTerminal.App.ViewModels.Settings
                 Colors = new TerminalColors(defaultTheme.Colors)
             };
 
-            AddTheme(theme);
+            _settingsService.SaveTheme(theme);
+
+            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
+            viewModel.Activated += OnThemeActivated;
+            viewModel.Deleted += OnThemeDeleted;
+            Themes.Add(viewModel);
+            SelectedTheme = viewModel;
         }
 
         private async void ImportTheme()
@@ -126,7 +118,13 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     var theme = await parser.Parse(file.Name, file.Content).ConfigureAwait(true);
 
-                    AddTheme(theme);
+                    _settingsService.SaveTheme(theme);
+
+                    var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
+                    viewModel.Activated += OnThemeActivated;
+                    viewModel.Deleted += OnThemeDeleted;
+                    Themes.Add(viewModel);
+                    SelectedTheme = viewModel;
                 }
                 catch (Exception exception)
                 {
@@ -135,18 +133,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        private void AddTheme(TerminalTheme theme)
-        {
-            _settingsService.SaveTheme(theme, true);
-
-            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, true);
-            viewModel.EditCommand.Execute(null);
-            viewModel.Activated += OnThemeActivated;
-            viewModel.Deleted += OnThemeDeleted;
-            Themes.Add(viewModel);
-            SelectedTheme = viewModel;
-        }
-
         private void OnThemeActivated(object sender, EventArgs e)
         {
             if (sender is ThemeViewModel activatedTheme)

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -8,33 +8,22 @@ namespace FluentTerminal.App.ViewModels
     public class SettingsViewModel : ViewModelBase
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
-            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView applicationView)
+            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService, IFileSystemService fileSystemService)
         {
-            About = new AboutPageViewModel(settingsService, updateService, applicationView);
             KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, defaultValueProvider, trayProcessCommunicationService);
-            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService);
-            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
+            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider);
+            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService);
             Terminal = new TerminalPageViewModel(settingsService, dialogService, defaultValueProvider, systemFontService);
             Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService);
-            Mouse = new MousePageViewModel(settingsService, dialogService, defaultValueProvider);
         }
 
         public event EventHandler Closed;
-        public event EventHandler AboutPageRequested;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
         public ProfilesPageViewModel Shell { get; }
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
-        public MousePageViewModel Mouse { get; }
-        public AboutPageViewModel About { get; }
-
-        public void NavigateToAboutPage()
-        {
-            AboutPageRequested?.Invoke(this, EventArgs.Empty);
-        }
 
         public void Close()
         {

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

@@ -1,138 +1,69 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.App.ViewModels.Settings;
 using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
-using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class ShellProfileViewModel : ViewModelBase
     {
+        private readonly ShellProfile _shellProfile;
+        private string _name;
+        private string _arguments;
+        private string _location;
+        private string _workingDirectory;
+        private string _fallbackName;
+        private string _fallbackArguments;
+        private string _fallbackLocation;
+        private string _fallbackWorkingDirectory;
+        private bool _isDefault;
+        private bool _inEditMode;
+        private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IFileSystemService _fileSystemService;
-        private readonly ISettingsService _settingsService;
-        private string _arguments;
-        private ShellProfile _fallbackProfile;
-        private bool _inEditMode;
-        private bool _isDefault;
-        private string _location;
-        private LineEndingStyle _lineEndingStyle;
-        private string _name;
-        private bool _isNew;
-        private TabTheme _selectedTabTheme;
-        private TerminalTheme _selectedTerminalTheme;
-        private string _workingDirectory;
-        private readonly IApplicationView _applicationView;
-        private readonly IDefaultValueProvider _defaultValueProvider;
 
-        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider, Boolean isNew)
+        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
         {
-            Model = shellProfile;
+            _shellProfile = shellProfile;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
-            _applicationView = applicationView;
-            _defaultValueProvider = defaultValueProvider;
-            _isNew = isNew;
 
-            _settingsService.ThemeAdded += OnThemeAdded;
-            _settingsService.ThemeDeleted += OnThemeDeleted;
-
-            TabThemes = new ObservableCollection<TabTheme>(settingsService.GetTabThemes());
-
-            TerminalThemes = new ObservableCollection<TerminalTheme>();
-            TerminalThemes.Add(new TerminalTheme
-            {
-                Id = Guid.Empty,
-                Name = "Default"
-            });
-            foreach (var theme in _settingsService.GetThemes())
-            {
-                TerminalThemes.Add(theme);
-            }
-
-            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), _dialogService, string.Empty, false);
-
-            InitializeViewModelProperties(shellProfile);
-
-            SetDefaultCommand = new RelayCommand(SetDefault);
-            DeleteCommand = new AsyncCommand(Delete, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEdit);
-            SaveChangesCommand = new RelayCommand(SaveChanges);
-            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
-            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
-            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
-            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
-        }
-
-        private void InitializeViewModelProperties(ShellProfile shellProfile)
-        {
-            SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == shellProfile.TerminalThemeId);
             Id = shellProfile.Id;
             Name = shellProfile.Name;
             Arguments = shellProfile.Arguments;
             Location = shellProfile.Location;
             WorkingDirectory = shellProfile.WorkingDirectory;
-            SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == shellProfile.TabThemeId);
-            PreInstalled = shellProfile.PreInstalled;
-            LineEndingStyle = shellProfile.LineEndingTranslation;
 
-            KeyBindings.Clear();
-            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-            {
-                KeyBindings.Add(keyBinding);
-            }
-        }
-
-        private void OnThemeAdded(object sender, TerminalTheme e)
-        {
-            _applicationView.RunOnDispatcherThread(() =>
-            {
-                TerminalThemes.Add(e);
-            });
-        }
-
-        private void OnThemeDeleted(object sender, Guid e)
-        {
-            if (SelectedTerminalTheme.Id == e)
-            {
-                _applicationView.RunOnDispatcherThread(() =>
-                {
-                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(x => x.Id == Guid.Empty);
-                    Model.TerminalThemeId = Guid.Empty;
-                    if (_fallbackProfile != null)
-                    {
-                        _fallbackProfile.TerminalThemeId = Guid.Empty;
-                    }
-                });
-            }
+            SetDefaultCommand = new RelayCommand(SetDefault);
+            DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false), CanDelete);
+            EditCommand = new RelayCommand(Edit, CanEdit);
+            CancelEditCommand = new RelayCommand(async () => await CancelEdit().ConfigureAwait(false));
+            SaveChangesCommand = new RelayCommand(SaveChanges);
+            BrowseForCustomShellCommand = new RelayCommand(async () => await BrowseForCustomShell().ConfigureAwait(false));
+            BrowseForWorkingDirectoryCommand = new RelayCommand(async () => await BrowseForWorkingDirectory().ConfigureAwait(false));
         }
 
         public event EventHandler Deleted;
         public event EventHandler SetAsDefault;
 
-        public IAsyncCommand BrowseForCustomShellCommand { get; }
-        public IAsyncCommand BrowseForWorkingDirectoryCommand { get; }
-        public IAsyncCommand CancelEditCommand { get; }
-        public IAsyncCommand DeleteCommand { get; }
+        public RelayCommand DeleteCommand { get; }
         public RelayCommand EditCommand { get; }
         public RelayCommand SaveChangesCommand { get; }
+        public RelayCommand CancelEditCommand { get; }
         public RelayCommand SetDefaultCommand { get; }
-        public IAsyncCommand RestoreDefaultsCommand { get; }
-        public IAsyncCommand AddKeyboardShortcutCommand { get; }
-        public ObservableCollection<TabTheme> TabThemes { get; }
-        public KeyBindingsViewModel KeyBindings { get; }
+        public RelayCommand BrowseForCustomShellCommand { get; }
+        public RelayCommand BrowseForWorkingDirectoryCommand { get; }
 
-        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
-        public ShellProfile Model { get; private set; }
-        public bool PreInstalled { get; private set; }
+        public Guid Id { get; }
+
+        public string Name
+        {
+            get => _name;
+            set => Set(ref _name, value);
+        }
 
         public string Arguments
         {
@@ -140,129 +71,89 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _arguments, value);
         }
 
-        public Guid Id { get; private set; }
-
-        public bool InEditMode
-        {
-            get => _inEditMode;
-            set => Set(ref _inEditMode, value);
-        }
-
-        public bool IsDefault
-        {
-            get => _isDefault;
-            set => Set(ref _isDefault, value);
-        }
-
         public string Location
         {
             get => _location;
             set => Set(ref _location, value);
         }
 
-        public string Name
-        {
-            get => _name;
-            set => Set(ref _name, value);
-        }
-
-        public TabTheme SelectedTabTheme
-        {
-            get => _selectedTabTheme;
-            set
-            {
-                if (value != null)
-                {
-                    Set(ref _selectedTabTheme, value);
-                }
-            }
-        }
-
-        public TerminalTheme SelectedTerminalTheme
-        {
-            get => _selectedTerminalTheme;
-            set
-            {
-                if (value != null)
-                {
-                    Set(ref _selectedTerminalTheme, value);
-                }
-            }
-        }
-
         public string WorkingDirectory
         {
             get => _workingDirectory;
             set => Set(ref _workingDirectory, value);
         }
 
-        public LineEndingStyle LineEndingStyle
+        public bool IsDefault
         {
-            get => _lineEndingStyle;
-            set => Set(ref _lineEndingStyle, value);
+            get => _isDefault;
+            set => Set(ref _isDefault, value);
         }
 
-        public bool DoNotModifyIsSelected
+        public bool InEditMode
         {
-            get => LineEndingStyle == LineEndingStyle.DoNotModify;
-            set { if (value) LineEndingStyle = LineEndingStyle.DoNotModify; }
-        }
-
-        public bool ToCRLFIsSelected
-        {
-            get => LineEndingStyle == LineEndingStyle.ToCRLF;
-            set { if (value) LineEndingStyle = LineEndingStyle.ToCRLF; }
-        }
-
-        public bool ToLFIsSelected
-        {
-            get => LineEndingStyle == LineEndingStyle.ToLF;
-            set { if (value) LineEndingStyle = LineEndingStyle.ToLF; }
-        }
-
-        public bool ToCRIsSelected
-        {
-            get => LineEndingStyle == LineEndingStyle.ToCR;
-            set { if (value) LineEndingStyle = LineEndingStyle.ToCR; }
+            get => _inEditMode;
+            set => Set(ref _inEditMode, value);
         }
 
         public void SaveChanges()
         {
-            Model.Arguments = Arguments;
-            Model.Location = Location;
-            Model.Name = Name;
-            Model.WorkingDirectory = WorkingDirectory;
-            Model.TabThemeId = SelectedTabTheme.Id;
-            Model.TerminalThemeId = SelectedTerminalTheme.Id;
-            Model.LineEndingTranslation = _lineEndingStyle;
-            Model.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
-            _settingsService.SaveShellProfile(Model);
+            _shellProfile.Arguments = Arguments;
+            _shellProfile.Location = Location;
+            _shellProfile.Name = Name;
+            _shellProfile.WorkingDirectory = WorkingDirectory;
+
+            _settingsService.SaveShellProfile(_shellProfile);
 
-            KeyBindings.Editable = false;
             InEditMode = false;
-            _isNew = false;
         }
 
-        private async Task RestoreDefaults()
+        private async Task CancelEdit()
         {
-            if (InEditMode || !PreInstalled)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore this profile?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
-                Model = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id == Model.Id);
-                InitializeViewModelProperties(Model);
-                _settingsService.SaveShellProfile(Model);
+                Arguments = _fallbackArguments;
+                Location = _fallbackLocation;
+                Name = _fallbackName;
+                WorkingDirectory = _fallbackWorkingDirectory;
+
+                InEditMode = false;
             }
         }
 
-        public Task AddKeyboardShortcut()
+        private void Edit()
         {
-            return KeyBindings.ShowAddKeyBindingDialog();
+            _fallbackArguments = Arguments;
+            _fallbackLocation = Location;
+            _fallbackName = Name;
+            _fallbackWorkingDirectory = WorkingDirectory;
+            InEditMode = true;
+        }
+
+        private bool CanDelete()
+        {
+            return !_shellProfile.PreInstalled;
+        }
+
+        private bool CanEdit()
+        {
+            return !_shellProfile.PreInstalled;
+        }
+
+        private async Task Delete()
+        {
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
+            {
+                Deleted?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void SetDefault()
+        {
+            SetAsDefault?.Invoke(this, EventArgs.Empty);
         }
 
         private async Task BrowseForCustomShell()
@@ -282,95 +173,5 @@ namespace FluentTerminal.App.ViewModels
                 WorkingDirectory = directory;
             }
         }
-
-        private async Task CancelEdit()
-        {
-            if (_isNew)
-            {
-                await Delete();
-            }
-            else
-            {
-                ShellProfile changedProfile = new ShellProfile
-                {
-                    Arguments = Arguments,
-                    Location = Location,
-                    Name = Name,
-                    WorkingDirectory = WorkingDirectory,
-                    TabThemeId = SelectedTabTheme.Id,
-                    TerminalThemeId = SelectedTerminalTheme.Id,
-                    LineEndingTranslation = _lineEndingStyle,
-                    KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList()
-                };
-
-                if (!_fallbackProfile.Equals(changedProfile))
-                {
-                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-                    if (result == DialogButton.OK)
-                    {
-                        Arguments = _fallbackProfile.Arguments;
-                        Location = _fallbackProfile.Location;
-                        Name = _fallbackProfile.Name;
-                        WorkingDirectory = _fallbackProfile.WorkingDirectory;
-                        LineEndingStyle = _fallbackProfile.LineEndingTranslation;
-                        SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TerminalThemeId);
-                        SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TabThemeId);
-
-                        KeyBindings.KeyBindings.Clear();
-                        foreach (var keyBinding in Model.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-                        {
-                            KeyBindings.Add(keyBinding);
-                        }
-
-                        KeyBindings.Editable = false;
-                        InEditMode = false;
-                    }
-                }
-                else
-                {
-                    KeyBindings.Editable = false;
-                    InEditMode = false;
-                }
-            }
-        }
-
-        private bool CanDelete()
-        {
-            return !Model.PreInstalled;
-        }
-
-        private async Task Delete()
-        {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                Deleted?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        private void Edit()
-        {
-            // todo write copy ctor
-            _fallbackProfile = new ShellProfile
-            {
-                Arguments = Model.Arguments,
-                LineEndingTranslation = Model.LineEndingTranslation,
-                Location = Model.Location,
-                Name = Model.Name,
-                WorkingDirectory = Model.WorkingDirectory,
-                TabThemeId = Model.TabThemeId,
-                TerminalThemeId = Model.TerminalThemeId
-            };
-
-            KeyBindings.Editable = true;
-            InEditMode = true;
-        }
-
-        private void SetDefault()
-        {
-            SetAsDefault?.Invoke(this, EventArgs.Empty);
-        }
     }
-}
+}

FluentTerminal.App.ViewModels/SshConnectionInfoViewModel.cs

@@ -1,32 +0,0 @@
-using FluentTerminal.App.Services.Dialogs;
-using GalaSoft.MvvmLight;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class SshConnectionInfoViewModel : ViewModelBase, ISshConnectionInfo
-    {
-        private string _host = string.Empty;
-
-        public string Host
-        {
-            get => _host;
-            set => Set(ref _host, value);
-        }
-
-        private ushort _port = 22;
-
-        public ushort Port
-        {
-            get => _port;
-            set => Set(ref _port, value);
-        }
-
-        private string _username = string.Empty;
-
-        public string Username
-        {
-            get => _username;
-            set => Set(ref _username, value);
-        }
-    }
-}

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -1,12 +1,15 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
+using Fleck;
+using FluentTerminal.App.Services;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Pipes;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -14,100 +17,76 @@ namespace FluentTerminal.App.ViewModels
 {
     public class TerminalViewModel : ViewModelBase
     {
+        private readonly IDialogService _dialogService;
         private readonly IKeyboardCommandService _keyboardCommandService;
-        private readonly IDispatcherTimer _resizeOverlayTimer;
-        private bool _isSelected;
-        private bool _hasNewOutput;
+        private readonly ISettingsService _settingsService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private ApplicationSettings _applicationSettings;
         private string _resizeOverlayContent;
-        private string _searchText;
         private bool _showResizeOverlay;
+        private readonly string _startupDirectory;
+        private int _terminalId;
+        private ITerminalView _terminalView;
+        private string _title;
+        private readonly ShellProfile _shellProfile;
         private bool _showSearchPanel;
-        private TabTheme _tabTheme;
-        private TerminalTheme _terminalTheme;
-        private string _tabTitle;
-        private string _shellTitle;
-        private bool _hasCustomTitle;
+        private string _searchText;
+        private bool _isSelected;
+        private readonly IApplicationView _applicationView;
+        private readonly IDispatcherTimer _resizeOverlayTimer;
+        private readonly IClipboardService _clipboardService;
+        private IWebSocketConnection _webSocket;
+        private NamedPipeClientStream _namedPipe;
 
-        public TerminalViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
-            IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, ShellProfile shellProfile,
+        public TerminalViewModel(int id, ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
+            IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, string startupDirectory, ShellProfile shellProfile,
             IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
-            SettingsService = settingsService;
-            SettingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            SettingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            SettingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            SettingsService.KeyBindingsChanged += OnKeyBindingsChanged;
+            Id = id;
+            Title = DefaultTitle;
 
-            TrayProcessCommunicationService = trayProcessCommunicationService;
-
-            DialogService = dialogService;
+            _settingsService = settingsService;
+            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
+            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+            _settingsService.KeyBindingsChanged += OnKeyBindingsChanged;
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _dialogService = dialogService;
             _keyboardCommandService = keyboardCommandService;
-            ApplicationSettings = applicationSettings;
-            ApplicationView = applicationView;
-            ClipboardService = clipboardService;
-
-            ShellProfile = shellProfile;
-            TerminalTheme = shellProfile.TerminalThemeId == Guid.Empty ? SettingsService.GetCurrentTheme() : SettingsService.GetTheme(shellProfile.TerminalThemeId);
-
-            TabThemes = new ObservableCollection<TabTheme>(SettingsService.GetTabThemes());
-            TabTheme = TabThemes.FirstOrDefault(t => t.Id == ShellProfile.TabThemeId);
-
+            _applicationSettings = applicationSettings;
+            _startupDirectory = startupDirectory;
+            _shellProfile = shellProfile;
+            _applicationView = applicationView;
+            _clipboardService = clipboardService;
             _resizeOverlayTimer = dispatcherTimer;
             _resizeOverlayTimer.Interval = new TimeSpan(0, 0, 2);
             _resizeOverlayTimer.Tick += OnResizeOverlayTimerFinished;
 
-            CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
-            FindNextCommand = new RelayCommand(FindNext);
-            FindPreviousCommand = new RelayCommand(FindPrevious);
+            CloseCommand = new RelayCommand(async () => await InvokeCloseRequested().ConfigureAwait(false));
+            FindNextCommand = new RelayCommand(async () => await FindNext().ConfigureAwait(false));
+            FindPreviousCommand = new RelayCommand(async () => await FindPrevious().ConfigureAwait(false));
             CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel);
-            SelectTabThemeCommand = new RelayCommand<string>(SelectTabTheme);
-            EditTitleCommand = new AsyncCommand(EditTitle);
-
-            Terminal = new Terminal(TrayProcessCommunicationService);
-            Terminal.KeyboardCommandReceived += Terminal_KeyboardCommandReceived;
-            Terminal.OutputReceived += Terminal_OutputReceived;
-            Terminal.SizeChanged += Terminal_SizeChanged;
-            Terminal.TitleChanged += Terminal_TitleChanged;
-            Terminal.Closed += Terminal_Closed;
+            
         }
 
-        public event EventHandler Activated;
-        public event EventHandler Closed;
-        public event EventHandler<string> FindNextRequested;
-        public event EventHandler<string> FindPreviousRequested;
-        public event EventHandler KeyBindingsChanged;
-        public event EventHandler<TerminalOptions> OptionsChanged;
-        public event EventHandler SearchStarted;
-        public event EventHandler<TerminalTheme> ThemeChanged;
-        public event EventHandler<string> ShellTitleChanged;
-        public event EventHandler<string> CustomTitleChanged;
-
-        public ApplicationSettings ApplicationSettings { get; private set; }
-
-        public IApplicationView ApplicationView { get; }
-
-        public TabTheme BackgroundTabTheme
+        private async void OnKeyBindingsChanged(object sender, EventArgs e)
         {
-            // The effective background theme depends on whether it is selected (use the theme), or if it is inactive
-            // (if we're set to underline inactive tabs, use the null theme).
-            get => IsSelected || (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Background) ?
-                _tabTheme :
-                SettingsService.GetTabThemes().FirstOrDefault(t => t.Color == null);
+            var keyBindings = _settingsService.GetKeyBindings();
+            await _applicationView.RunOnDispatcherThread(async () =>
+            {
+                await _terminalView.ChangeKeyBindings(FlattenKeyBindings(keyBindings)).ConfigureAwait(false);
+            });
         }
 
-        public IClipboardService ClipboardService { get; }
+        public event EventHandler CloseRequested;
+
+        public event EventHandler<string> TitleChanged;
 
         public RelayCommand CloseCommand { get; }
 
-        public RelayCommand CloseSearchPanelCommand { get; }
-
-        public IDialogService DialogService { get; }
-
-        public IAsyncCommand EditTitleCommand { get; }
-
-        public RelayCommand FindNextCommand { get; }
-
         public RelayCommand FindPreviousCommand { get; }
+        public RelayCommand FindNextCommand { get; }
+        public RelayCommand CloseSearchPanelCommand { get; }
 
         public bool IsSelected
         {
@@ -116,30 +95,18 @@ namespace FluentTerminal.App.ViewModels
             {
                 if (Set(ref _isSelected, value))
                 {
-                    if (IsSelected)
-                    {
-                        HasNewOutput = false;
-                    }
                     RaisePropertyChanged(nameof(IsUnderlined));
-                    RaisePropertyChanged(nameof(BackgroundTabTheme));
                 }
             }
         }
 
-        public bool IsUnderlined => (IsSelected && ApplicationSettings.UnderlineSelectedTab) ||
-            (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Color != null);
+        public bool IsUnderlined => IsSelected && _applicationSettings.UnderlineSelectedTab;
 
-        public bool HasNewOutput
-        {
-            get => _hasNewOutput;
-            set => Set(ref _hasNewOutput, value);
-        }
+        public int Id { get; }
 
-        public string ResizeOverlayContent
-        {
-            get => _resizeOverlayContent;
-            set => Set(ref _resizeOverlayContent, value);
-        }
+        public bool Initialized { get; private set; }
+
+        public string DefaultTitle { get; private set; } = "Fluent Terminal";
 
         public string SearchText
         {
@@ -147,11 +114,17 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _searchText, value);
         }
 
-        public RelayCommand<string> SelectTabThemeCommand { get; }
+        public bool ShowSearchPanel
+        {
+            get => _showSearchPanel;
+            set => Set(ref _showSearchPanel, value);
+        }
 
-        public ISettingsService SettingsService { get; }
-
-        public ShellProfile ShellProfile { get; }
+        public string ResizeOverlayContent
+        {
+            get => _resizeOverlayContent;
+            set => Set(ref _resizeOverlayContent, value);
+        }
 
         public bool ShowResizeOverlay
         {
@@ -170,140 +143,178 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public bool ShowSearchPanel
+        public string Title
         {
-            get => _showSearchPanel;
-            set => Set(ref _showSearchPanel, value);
-        }
-
-        public TabTheme TabTheme
-        {
-            get => _tabTheme;
+            get => _title;
             set
             {
-                Set(ref _tabTheme, value);
-                RaisePropertyChanged(nameof(IsUnderlined));
-                RaisePropertyChanged(nameof(BackgroundTabTheme));
+                value = string.IsNullOrWhiteSpace(value) ? DefaultTitle : value;
+
+                if (Set(ref _title, value))
+                {
+                    TitleChanged?.Invoke(this, Title);
+                }
             }
         }
 
-        public ObservableCollection<TabTheme> TabThemes { get; }
-
-        public Terminal Terminal { get; private set; }
-
-        public TerminalTheme TerminalTheme
+        public void CloseView()
         {
-            get => _terminalTheme;
-            set => Set(ref _terminalTheme, value);
+            _terminalView.Close();
         }
 
-        public string TabTitle
+        public Task FocusTerminal()
         {
-            get => _tabTitle;
-            set
+            return _terminalView?.FocusTerminal();
+        }
+
+        public async Task OnViewIsReady(ITerminalView terminalView)
+        {
+            _terminalView = terminalView;
+
+            var options = _settingsService.GetTerminalOptions();
+            var theme = _settingsService.GetCurrentTheme();
+            var keyBindings = _settingsService.GetKeyBindings();
+
+            var size = await _terminalView.CreateTerminal(options, theme.Colors, FlattenKeyBindings(keyBindings)).ConfigureAwait(true);
+
+            if (!string.IsNullOrWhiteSpace(_startupDirectory))
             {
-                if (Set(ref _tabTitle, value))
-                {
-                    CustomTitleChanged?.Invoke(this, value);
-                }
+                _shellProfile.WorkingDirectory = _startupDirectory;
             }
-        }
 
-        public string ShellTitle
-        {
-            get => _shellTitle;
-            set
+            var response = await _trayProcessCommunicationService.CreateTerminal(size, _shellProfile).ConfigureAwait(true);
+
+            if (response.Success)
             {
-                if (Set(ref _shellTitle, value) && !_hasCustomTitle)
+                _terminalId = response.Id;
+                _terminalView.TerminalSizeChanged += OnTerminalSizeChanged;
+                _terminalView.TerminalTitleChanged += OnTerminalTitleChanged;
+                _terminalView.KeyboardCommandReceived += OnKeyboardCommandReceived;
+
+                DefaultTitle = response.ShellExecutableName;
+                Title = DefaultTitle;
+
+                _namedPipe = new NamedPipeClientStream(".", response.PipeName, PipeDirection.InOut, PipeOptions.None);
+                if (!_namedPipe.IsConnected)
                 {
-                    TabTitle = value;
+                    _namedPipe.Connect();
                 }
+
+                var webSocketUrl = "ws://127.0.0.1:" + response.Port;
+                var webSocketServer = new WebSocketServer(webSocketUrl);
+                webSocketServer.Start(socket =>
+                {
+                    _webSocket = socket;
+                    socket.OnOpen = () =>
+                    {
+                        Console.WriteLine("open");
+                        //_connectedEvent.Set();
+                    };
+                    socket.OnClose = () =>
+                    {
+                        Console.WriteLine("closing");
+                        _namedPipe.Close();
+                    };
+                    socket.OnMessage = message =>
+                    {
+                        var bytes = Encoding.UTF8.GetBytes(message);
+                        _namedPipe.Write(bytes, 0, bytes.Length);
+                    };
+                });
+
+                ListenToNamedPipe();
+
+                await _terminalView.ConnectToSocket(webSocketUrl).ConfigureAwait(true);
+                Initialized = true;
             }
-        }
-
-        public ITrayProcessCommunicationService TrayProcessCommunicationService { get; }
-
-        public Task Close()
-        {
-            SettingsService.CurrentThemeChanged -= OnCurrentThemeChanged;
-            SettingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
-            SettingsService.ApplicationSettingsChanged -= OnApplicationSettingsChanged;
-            SettingsService.KeyBindingsChanged -= OnKeyBindingsChanged;
-            return Terminal.Close();
-        }
-
-        public void CopyText(string text)
-        {
-            ClipboardService.SetText(text);
-        }
-
-        public async Task EditTitle()
-        {
-            var result = await DialogService.ShowInputDialogAsync("Edit Title");
-            if (result != null)
+            else
             {
-                if (string.IsNullOrWhiteSpace(result))
+                await _dialogService.ShowMessageDialogAsnyc("Error", response.Error, DialogButton.OK).ConfigureAwait(true);
+            }
+
+            await FocusTerminal().ConfigureAwait(true);
+        }
+
+        private void ListenToNamedPipe()
+        {
+            Task.Run(async () =>
+            {
+                var reader = new StreamReader(_namedPipe);
+                do
                 {
-                    _hasCustomTitle = false;
-                    TabTitle = ShellTitle;
+                    var offset = 0;
+                    var buffer = new char[1024];
+                    var readChars = await reader.ReadAsync(buffer, offset, buffer.Length - offset);
+                    if (readChars > 0)
+                    {
+                        await _webSocket.Send(new String(buffer));
+                    }
                 }
-                else
+                while (!reader.EndOfStream);
+                _webSocket.Close();
+            });
+        }
+
+        private async Task InvokeCloseRequested()
+        {
+            if (_applicationSettings.ConfirmClosingTabs)
+            {
+                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+                if (result == DialogButton.Cancel)
                 {
-                    _hasCustomTitle = true;
-                    TabTitle = result;
+                    return;
                 }
             }
-        }
 
-        public void FocusTerminal()
-        {
-            Activated?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void CloseSearchPanel()
-        {
-            SearchText = string.Empty;
-            ShowSearchPanel = false;
-            FocusTerminal();
-        }
-
-        private void FindNext()
-        {
-            FindNextRequested?.Invoke(this, SearchText);
-        }
-
-        private void FindPrevious()
-        {
-            FindPreviousRequested?.Invoke(this, SearchText);
+            CloseRequested?.Invoke(this, EventArgs.Empty);
         }
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
+            await _applicationView.RunOnDispatcherThread(() =>
             {
-                ApplicationSettings = e;
+                _applicationSettings = e;
                 RaisePropertyChanged(nameof(IsUnderlined));
-                RaisePropertyChanged(nameof(BackgroundTabTheme));
             });
         }
 
         private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
+            await _applicationView.RunOnDispatcherThread(async () =>
             {
-                // only change theme if not overwritten by profile
-                if (ShellProfile.TerminalThemeId == Guid.Empty)
-                {
-                    var currentTheme = SettingsService.GetTheme(e);
-                    TerminalTheme = currentTheme;
-                    ThemeChanged?.Invoke(this, currentTheme);
-                }
+                var currentTheme = _settingsService.GetTheme(e);
+                await _terminalView.ChangeTheme(currentTheme.Colors).ConfigureAwait(true);
             });
         }
 
-        private async void OnKeyBindingsChanged(object sender, EventArgs e)
+        private async void OnKeyboardCommandReceived(object sender, Command e)
         {
-            await ApplicationView.RunOnDispatcherThread(() => KeyBindingsChanged?.Invoke(this, EventArgs.Empty));
+            if (e == Command.Copy)
+            {
+                var selection = await _terminalView.GetSelection().ConfigureAwait(true);
+                _clipboardService.SetText(selection);
+            }
+            else if (e == Command.Paste)
+            {
+                var content = await _clipboardService.GetText().ConfigureAwait(true);
+                if (content != null)
+                {
+                    await _terminalView.Write(content).ConfigureAwait(true);
+                }
+            }
+            else if (e == Command.Search)
+            {
+                ShowSearchPanel = !ShowSearchPanel;
+                if (ShowSearchPanel)
+                {
+                    _terminalView.FocusSearchTextBox();
+                }
+            }
+            else
+            {
+                _keyboardCommandService.SendCommand(e);
+            }
         }
 
         private void OnResizeOverlayTimerFinished(object sender, object e)
@@ -314,99 +325,77 @@ namespace FluentTerminal.App.ViewModels
 
         private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
-        }
-
-        private void SelectTabTheme(string name)
-        {
-            TabTheme = TabThemes.FirstOrDefault(t => t.Name == name);
-        }
-
-        private void Terminal_Closed(object sender, EventArgs e)
-        {
-            ApplicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
-        }
-
-        private async void Terminal_KeyboardCommandReceived(object sender, string e)
-        {
-            switch (e)
+            await _applicationView.RunOnDispatcherThread(async () =>
             {
-                case nameof(Command.Copy):
-                    {
-                        var selection = await Terminal.GetSelectedText().ConfigureAwait(true);
-                        ClipboardService.SetText(selection);
-                        break;
-                    }
-                case nameof(Command.Paste):
-                    {
-                        string content = await ClipboardService.GetText().ConfigureAwait(true);
-                        if (content != null)
-                        {
-                            content = ShellProfile.TranslateLineEndings(content);
-                            await Terminal.Write(Encoding.UTF8.GetBytes(content)).ConfigureAwait(true);
-                        }
-                        break;
-                    }
-                case nameof(Command.PasteWithoutNewlines):
-                    {
-                        string content = await ClipboardService.GetText().ConfigureAwait(true);
-                        if (content != null)
-                        {
-                            content = ShellProfile.NewlinePattern.Replace(content, string.Empty);
-                            await Terminal.Write(Encoding.UTF8.GetBytes(content)).ConfigureAwait(true);
-                        }
-                        break;
-                    }
-                case nameof(Command.Search):
-                    {
-                        ShowSearchPanel = !ShowSearchPanel;
-                        if (ShowSearchPanel)
-                        {
-                            SearchStarted?.Invoke(this, EventArgs.Empty);
-                        }
-                        break;
-                    }
-                default:
-                    {
-                        _keyboardCommandService.SendCommand(e);
-                        break;
-                    }
-            }
+                await _terminalView.ChangeOptions(e).ConfigureAwait(true);
+            });
         }
 
-        private void Terminal_OutputReceived(object sender, byte[] e)
+        private async void OnTerminalSizeChanged(object sender, TerminalSize e)
         {
-            if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
+            if (!Initialized)
             {
-                ApplicationView.RunOnDispatcherThread(() => HasNewOutput = true);
+                return;
             }
-        }
-
-        private void Terminal_SizeChanged(object sender, TerminalSize e)
-        {
             ResizeOverlayContent = $"{e.Columns} x {e.Rows}";
             ShowResizeOverlay = true;
+            await _trayProcessCommunicationService.ResizeTerminal(_terminalId, e).ConfigureAwait(true);
         }
 
-        private void Terminal_TitleChanged(object sender, string e)
+        private void OnTerminalTitleChanged(object sender, string e)
         {
-            ShellTitle = e;
-            ShellTitleChanged?.Invoke(this, e);
+            Title = e;
         }
 
-        private async Task TryClose()
+        private IEnumerable<KeyBinding> FlattenKeyBindings(IDictionary<Command, ICollection<KeyBinding>> keyBindings)
         {
-            if (ApplicationSettings.ConfirmClosingTabs)
+            return keyBindings.Values.SelectMany(k => k);
+        }
+
+        private Task FindNext()
+        {
+            return _terminalView.FindNext(SearchText);
+        }
+
+        private Task FindPrevious()
+        {
+            return _terminalView.FindPrevious(SearchText);
+        }
+
+        private void CloseSearchPanel()
+        {
+            SearchText = string.Empty;
+            ShowSearchPanel = false;
+            _terminalView.FocusTerminal();
+        }
+
+        private const int FirstDynamicPort = 49151;
+
+        public static int? GetAvailablePort()
+        {
+            var usedPorts = new List<int>();
+
+            var properties = IPGlobalProperties.GetIPGlobalProperties();
+
+            var connections = properties.GetActiveTcpConnections();
+            usedPorts.AddRange(connections.Where(c => c.LocalEndPoint.Port >= FirstDynamicPort).Select(c => c.LocalEndPoint.Port));
+
+            var endPoints = properties.GetActiveTcpListeners();
+            usedPorts.AddRange(endPoints.Where(e => e.Port >= FirstDynamicPort).Select(e => e.Port));
+
+            endPoints = properties.GetActiveUdpListeners();
+            usedPorts.AddRange(endPoints.Where(e => e.Port >= FirstDynamicPort).Select(e => e.Port));
+
+            usedPorts.Sort();
+
+            for (var i = FirstDynamicPort; i < UInt16.MaxValue; i++)
             {
-                var result = await DialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-                if (result == DialogButton.Cancel)
+                if (!usedPorts.Contains(i))
                 {
-                    return;
+                    return i;
                 }
             }
-
-            await Close().ConfigureAwait(true);
+            return null;
         }
     }
 }

FluentTerminal.App.ViewModels/ThemeViewModel.cs

@@ -29,57 +29,58 @@ namespace FluentTerminal.App.ViewModels
         private string _cursor;
         private string _cursorAccent;
         private string _cyan;
-        private TerminalTheme _fallbackTheme;
+        private string _fallBackAuthor;
+        private TerminalColors _fallBackColors;
+        private string _fallBackName;
         private string _foreground;
         private string _green;
         private bool _inEditMode;
         private bool _isActive;
         private string _magenta;
         private string _name;
-        private bool _isNew;
         private string _red;
         private string _selection;
+        private readonly TerminalTheme _theme;
         private string _white;
         private string _yellow;
         private readonly IFileSystemService _fileSystemService;
 
         public event EventHandler<string> BackgroundChanged;
 
-        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, bool isNew)
+        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
         {
-            Model = theme;
+            _theme = theme;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
-            _isNew = isNew;
 
-            Name = Model.Name;
-            Author = Model.Author;
-            Id = Model.Id;
+            Name = _theme.Name;
+            Author = _theme.Author;
+            Id = _theme.Id;
 
-            Black = Model.Colors.Black;
-            Red = Model.Colors.Red;
-            Green = Model.Colors.Green;
-            Yellow = Model.Colors.Yellow;
-            Blue = Model.Colors.Blue;
-            Magenta = Model.Colors.Magenta;
-            Cyan = Model.Colors.Cyan;
-            White = Model.Colors.White;
+            Black = _theme.Colors.Black;
+            Red = _theme.Colors.Red;
+            Green = _theme.Colors.Green;
+            Yellow = _theme.Colors.Yellow;
+            Blue = _theme.Colors.Blue;
+            Magenta = _theme.Colors.Magenta;
+            Cyan = _theme.Colors.Cyan;
+            White = _theme.Colors.White;
 
-            BrightBlack = Model.Colors.BrightBlack;
-            BrightRed = Model.Colors.BrightRed;
-            BrightGreen = Model.Colors.BrightGreen;
-            BrightYellow = Model.Colors.BrightYellow;
-            BrightBlue = Model.Colors.BrightBlue;
-            BrightMagenta = Model.Colors.BrightMagenta;
-            BrightCyan = Model.Colors.BrightCyan;
-            BrightWhite = Model.Colors.BrightWhite;
+            BrightBlack = _theme.Colors.BrightBlack;
+            BrightRed = _theme.Colors.BrightRed;
+            BrightGreen = _theme.Colors.BrightGreen;
+            BrightYellow = _theme.Colors.BrightYellow;
+            BrightBlue = _theme.Colors.BrightBlue;
+            BrightMagenta = _theme.Colors.BrightMagenta;
+            BrightCyan = _theme.Colors.BrightCyan;
+            BrightWhite = _theme.Colors.BrightWhite;
 
-            Background = Model.Colors.Background;
-            Foreground = Model.Colors.Foreground;
-            Cursor = Model.Colors.Cursor;
-            CursorAccent = Model.Colors.CursorAccent;
-            Selection = Model.Colors.Selection;
+            Background = _theme.Colors.Background;
+            Foreground = _theme.Colors.Foreground;
+            Cursor = _theme.Colors.Cursor;
+            CursorAccent = _theme.Colors.CursorAccent;
+            Selection = _theme.Colors.Selection;
 
             SetActiveCommand = new RelayCommand(SetActive);
             DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false), NotPreInstalled);
@@ -93,8 +94,6 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler Deleted;
 
-        public TerminalTheme Model { get; }
-
         public string Author
         {
             get => _author;
@@ -269,125 +268,78 @@ namespace FluentTerminal.App.ViewModels
 
         public void SaveChanges()
         {
-            Model.Name = Name;
-            Model.Author = Author;
+            _theme.Name = Name;
+            _theme.Author = Author;
 
-            Model.Colors.Black = Black;
-            Model.Colors.Red = Red;
-            Model.Colors.Green = Green;
-            Model.Colors.Yellow = Yellow;
-            Model.Colors.Blue = Blue;
-            Model.Colors.Magenta = Magenta;
-            Model.Colors.Cyan = Cyan;
-            Model.Colors.White = White;
+            _theme.Colors.Black = Black;
+            _theme.Colors.Red = Red;
+            _theme.Colors.Green = Green;
+            _theme.Colors.Yellow = Yellow;
+            _theme.Colors.Blue = Blue;
+            _theme.Colors.Magenta = Magenta;
+            _theme.Colors.Cyan = Cyan;
+            _theme.Colors.White = White;
 
-            Model.Colors.BrightBlack = BrightBlack;
-            Model.Colors.BrightRed = BrightRed;
-            Model.Colors.BrightGreen = BrightGreen;
-            Model.Colors.BrightYellow = BrightYellow;
-            Model.Colors.BrightBlue = BrightBlue;
-            Model.Colors.BrightMagenta = BrightMagenta;
-            Model.Colors.BrightCyan = BrightCyan;
-            Model.Colors.BrightWhite = BrightWhite;
+            _theme.Colors.BrightBlack = BrightBlack;
+            _theme.Colors.BrightRed = BrightRed;
+            _theme.Colors.BrightGreen = BrightGreen;
+            _theme.Colors.BrightYellow = BrightYellow;
+            _theme.Colors.BrightBlue = BrightBlue;
+            _theme.Colors.BrightMagenta = BrightMagenta;
+            _theme.Colors.BrightCyan = BrightCyan;
+            _theme.Colors.BrightWhite = BrightWhite;
 
-            Model.Colors.Background = Background;
-            Model.Colors.Foreground = Foreground;
-            Model.Colors.Cursor = Cursor;
-            Model.Colors.CursorAccent = CursorAccent;
-            Model.Colors.Selection = Selection;
+            _theme.Colors.Background = Background;
+            _theme.Colors.Foreground = Foreground;
+            _theme.Colors.Cursor = Cursor;
+            _theme.Colors.CursorAccent = CursorAccent;
+            _theme.Colors.Selection = Selection;
 
-            _settingsService.SaveTheme(Model);
+            _settingsService.SaveTheme(_theme);
 
             InEditMode = false;
-            _isNew = false;
         }
 
         private async Task CancelEdit()
         {
-            if (_isNew)
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
             {
-                await Delete();
-            }
-            else
-            {
-                TerminalTheme changedTheme = new TerminalTheme()
-                {
-                    Name = Name,
-                    Author = Author,
-                    Colors = new TerminalColors()
-                    {
-                        Black = Black,
-                        Red = Red,
-                        Green = Green,
-                        Yellow = Yellow,
-                        Blue = Blue,
-                        Magenta = Magenta,
-                        Cyan = Cyan,
-                        White = White,
+                Black = _fallBackColors.Black;
+                Red = _fallBackColors.Red;
+                Green = _fallBackColors.Green;
+                Yellow = _fallBackColors.Yellow;
+                Blue = _fallBackColors.Blue;
+                Magenta = _fallBackColors.Magenta;
+                Cyan = _fallBackColors.Cyan;
+                White = _fallBackColors.White;
 
-                        BrightBlack = BrightBlack,
-                        BrightRed = BrightRed,
-                        BrightGreen = BrightGreen,
-                        BrightYellow = BrightYellow,
-                        BrightBlue = BrightBlue,
-                        BrightMagenta = BrightMagenta,
-                        BrightCyan = BrightCyan,
-                        BrightWhite = BrightWhite,
+                BrightBlack = _fallBackColors.BrightBlack;
+                BrightRed = _fallBackColors.BrightRed;
+                BrightGreen = _fallBackColors.BrightGreen;
+                BrightYellow = _fallBackColors.BrightYellow;
+                BrightBlue = _fallBackColors.BrightBlue;
+                BrightMagenta = _fallBackColors.BrightMagenta;
+                BrightCyan = _fallBackColors.BrightCyan;
+                BrightWhite = _fallBackColors.BrightWhite;
 
-                        Background = Background,
-                        Foreground = Foreground,
-                        Cursor = Cursor,
-                        CursorAccent = CursorAccent,
-                        Selection = Selection
-                    }
-                };
+                Background = _fallBackColors.Background;
+                Foreground = _fallBackColors.Foreground;
+                Cursor = _fallBackColors.Cursor;
+                CursorAccent = _fallBackColors.CursorAccent;
+                Selection = _fallBackColors.Selection;
 
-                if (!_fallbackTheme.Equals(changedTheme))
-                {
-                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+                Name = _fallBackName;
+                Author = _fallBackAuthor;
 
-                    if (result == DialogButton.OK)
-                    {
-                        Black = _fallbackTheme.Colors.Black;
-                        Red = _fallbackTheme.Colors.Red;
-                        Green = _fallbackTheme.Colors.Green;
-                        Yellow = _fallbackTheme.Colors.Yellow;
-                        Blue = _fallbackTheme.Colors.Blue;
-                        Magenta = _fallbackTheme.Colors.Magenta;
-                        Cyan = _fallbackTheme.Colors.Cyan;
-                        White = _fallbackTheme.Colors.White;
-
-                        BrightBlack = _fallbackTheme.Colors.BrightBlack;
-                        BrightRed = _fallbackTheme.Colors.BrightRed;
-                        BrightGreen = _fallbackTheme.Colors.BrightGreen;
-                        BrightYellow = _fallbackTheme.Colors.BrightYellow;
-                        BrightBlue = _fallbackTheme.Colors.BrightBlue;
-                        BrightMagenta = _fallbackTheme.Colors.BrightMagenta;
-                        BrightCyan = _fallbackTheme.Colors.BrightCyan;
-                        BrightWhite = _fallbackTheme.Colors.BrightWhite;
-
-                        Background = _fallbackTheme.Colors.Background;
-                        Foreground = _fallbackTheme.Colors.Foreground;
-                        Cursor = _fallbackTheme.Colors.Cursor;
-                        CursorAccent = _fallbackTheme.Colors.CursorAccent;
-                        Selection = _fallbackTheme.Colors.Selection;
-
-                        Name = _fallbackTheme.Name;
-                        Author = _fallbackTheme.Author;
-
-                        InEditMode = false;
-                    }
-                }
-                else
-                {
-                    InEditMode = false;
-                }
+                InEditMode = false;
             }
         }
 
         private bool NotPreInstalled()
         {
-            return !Model.PreInstalled;
+            return !_theme.PreInstalled;
         }
 
         private async Task Delete()
@@ -402,7 +354,9 @@ namespace FluentTerminal.App.ViewModels
 
         private void Edit()
         {
-            _fallbackTheme = new TerminalTheme(Model);
+            _fallBackColors = new TerminalColors(_theme.Colors);
+            _fallBackName = Name;
+            _fallBackAuthor = Author;
             InEditMode = true;
         }
 
@@ -413,7 +367,7 @@ namespace FluentTerminal.App.ViewModels
 
         private Task Export()
         {
-            var content = JsonConvert.SerializeObject(Model, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
+            var content = JsonConvert.SerializeObject(_theme, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
             return _fileSystemService.SaveTextFile(Name, "Fluent Terminal Theme", ".flutecolors", content);
         }
     }

FluentTerminal.App.ViewModels/Utilities/TaskUtilities.cs

@@ -1,23 +0,0 @@
-using FluentTerminal.App.ViewModels.Infrastructure;
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels.Utilities
-{
-    public static class TaskUtilities
-    {
-        #pragma warning disable RECS0165 // Asynchronous methods should return a Task instead of void
-        public static async void FireAndForgetSafeAsync(this Task task, IErrorHandler handler = null)
-        #pragma warning restore RECS0165 // Asynchronous methods should return a Task instead of void
-        {
-            try
-            {
-                await task;
-            }
-            catch (Exception ex)
-            {
-                handler?.HandleError(ex);
-            }
-        }
-    }
-}

FluentTerminal.App/Adapters/AppServiceConnectionAdapter.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -12,24 +11,9 @@ namespace FluentTerminal.App.Adapters
     {
         private readonly AppServiceConnection _appServiceConnection;
 
-        public event EventHandler<IDictionary<string, string>> MessageReceived;
-
         public AppServiceConnectionAdapter(AppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
-            _appServiceConnection.RequestReceived += OnRequestReceived;
-        }
-
-        private void OnRequestReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
-        {
-            var messageType = (string)args.Request.Message[MessageKeys.Type];
-            var messageContent = (string)args.Request.Message[MessageKeys.Content];
-
-            MessageReceived?.Invoke(this, new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = messageType,
-                [MessageKeys.Content] = messageContent
-            });
         }
 
         public async Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message)
@@ -55,4 +39,4 @@ namespace FluentTerminal.App.Adapters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Adapters/ApplicationDataContainerAdapter.cs

@@ -1,10 +1,11 @@
-using Newtonsoft.Json;
+using FluentTerminal.App.Services;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Storage;
 
-namespace FluentTerminal.App.Services.Adapters
+namespace FluentTerminal.App.Adapters
 {
     public class ApplicationDataContainerAdapter : IApplicationDataContainer
     {
@@ -49,6 +50,7 @@ namespace FluentTerminal.App.Services.Adapters
             return _applicationDataContainer.Values.TryGetValue(key, out value);
         }
 
+
         public void WriteValueAsJson<T>(string name, T value)
         {
             _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value);

FluentTerminal.App/Adapters/ApplicationViewAdapter.cs

@@ -3,7 +3,6 @@ using FluentTerminal.App.Services.EventArgs;
 using System;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
-using Windows.Foundation.Metadata;
 using Windows.UI.Core;
 using Windows.UI.Core.Preview;
 using Windows.UI.ViewManagement;
@@ -14,37 +13,20 @@ namespace FluentTerminal.App.Adapters
     {
         private readonly ApplicationView _applicationView;
         private readonly CoreDispatcher _dispatcher;
-        private bool _closed;
 
         public event CloseRequestedHandler CloseRequested;
-        public event EventHandler Closed;
 
         public ApplicationViewAdapter()
         {
             _applicationView = ApplicationView.GetForCurrentView();
-            _applicationView.Consolidated += _applicationView_Consolidated;
             _dispatcher = CoreApplication.GetCurrentView().Dispatcher;
             SystemNavigationManagerPreview.GetForCurrentView().CloseRequested += OnCloseRequest;
-
-            Logger.Instance.Debug("Created ApplicationViewAdapter for ApplicationView with Id: {Id}", _applicationView.Id);
         }
 
-        private void _applicationView_Consolidated(ApplicationView sender, ApplicationViewConsolidatedEventArgs args)
-        {
-            Closed?.Invoke(this, EventArgs.Empty);
-        }
-
-        public int Id => _applicationView.Id;
-
         public string Title
         {
             get => _applicationView.Title;
-            set => _applicationView.Title = value ?? string.Empty;
-        }
-
-        public bool IsApiContractPresent(string api, ushort version)
-        {
-            return ApiInformation.IsApiContractPresent(api, version);
+            set => _applicationView.Title = value;
         }
 
         public Task RunOnDispatcherThread(Action action)
@@ -52,16 +34,9 @@ namespace FluentTerminal.App.Adapters
             return _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).AsTask();
         }
 
-        public async Task<bool> TryClose()
+        public Task<bool> TryClose()
         {
-            if (_closed)
-            {
-                Logger.Instance.Debug("ApplicationViewAdapter.TryClose was called, but was already closed. ApplicationView.Id: {Id}", _applicationView.Id);
-                return true;
-            }
-            Logger.Instance.Debug("TryClose ApplicationView with Id: {Id}", _applicationView.Id);
-            _closed = await _applicationView.TryConsolidateAsync().AsTask();
-            return _closed;
+            return _applicationView.TryConsolidateAsync().AsTask();
         }
 
         public bool ToggleFullScreen()
@@ -82,20 +57,12 @@ namespace FluentTerminal.App.Adapters
             var deferral = e.GetDeferral();
 
             var args = new CancelableEventArgs();
-
-            if (CloseRequested != null)
-            {
-                await CloseRequested.Invoke(this, args);
-            }
+            await CloseRequested?.Invoke(this, args);
 
             e.Handled = args.Cancelled;
 
-            if (!e.Handled)
-            {
-                SystemNavigationManagerPreview.GetForCurrentView().CloseRequested -= OnCloseRequest;
-            }
-
             deferral.Complete();
         }
     }
-}
+}
+

FluentTerminal.App/Adapters/DispatcherTimerAdapter.cs

@@ -1,5 +1,5 @@
-using FluentTerminal.App.Services;
-using System;
+using System;
+using FluentTerminal.App.Services;
 using Windows.UI.Xaml;
 
 namespace FluentTerminal.App.Adapters
@@ -39,4 +39,4 @@ namespace FluentTerminal.App.Adapters
             _dispatcherTimer.Stop();
         }
     }
-}
+}

FluentTerminal.App/App.xaml

@@ -8,10 +8,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles\Custom.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <LinearGradientBrush x:Key="MissingColorSelectionBrush" StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Offset="0" Color="Black" />
-                <GradientStop Offset="1.0" Color="White" />
-            </LinearGradientBrush>
             <converters:IntToVisibilityConverter
                 x:Key="OneToVisibleConverter"
                 Else="Collapsed"
@@ -25,7 +21,6 @@
             <converters:NegateConverter x:Key="NegateConverter" />
             <converters:FalseToVisibleConverter x:Key="FalseToVisibleConverter" />
             <converters:TrueToVisibleConverter x:Key="TrueToVisibleConverter" />
-            <converters:TabColorFallbackConverter x:Key="TabColorFallbackConverter" />
             <converters:IntToVisibilityConverter
                 x:Key="ZeroToCollapsedConverter"
                 Else="Visible"
@@ -34,11 +29,6 @@
             <converters:IntToExtendedVirtualKeyConverter x:Key="IntToExtendedVirtualKeyConverter" />
             <converters:BackgroundToApplicationThemeConverter x:Key="BackgroundToApplicationThemeConverter" />
             <converters:StringToColorConverter x:Key="StringToColorConverter" />
-            <converters:EnumValueToVisibiltyConverter x:Key="EnumValueToVisibiltyConverter" />
-            <converters:TabThemeSelectedConverter x:Key="TabThemeSelectedConverter" />
-            <converters:ColorResourceKeyFallbackConverter x:Key="ColorResourceKeyFallbackConverter" />
-            <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
-            <converters:TrueToBoldConverter x:Key="TrueToBoldConverter" />
         </ResourceDictionary>
     </Application.Resources>
-</Application>
+</Application>

FluentTerminal.App/App.xaml.cs

@@ -1,453 +1,305 @@
-using Autofac;
-using CommandLine;
-using FluentTerminal.App.Adapters;
-using FluentTerminal.App.CommandLineArguments;
-using FluentTerminal.App.Dialogs;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Adapters;
-using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.App.Services.EventArgs;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.App.ViewModels;
-using FluentTerminal.App.Views;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Background;
-using Windows.ApplicationModel.Core;
-using Windows.Storage;
-using Windows.UI.Core;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using IContainer = Autofac.IContainer;
-
-namespace FluentTerminal.App
-{
-    public sealed partial class App : Application
-    {
-        public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
-        private readonly ISettingsService _settingsService;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private bool _alreadyLaunched;
-        private ApplicationSettings _applicationSettings;
-        private readonly IContainer _container;
-        private readonly List<MainViewModel> _mainViewModels;
-        private SettingsViewModel _settingsViewModel;
-        private int? _settingsWindowId;
-        private IAppServiceConnection _appServiceConnection;
-        private BackgroundTaskDeferral _appServiceDeferral;
-        private Parser _commandLineParser;
-
-        public App()
-        {
-            _mainViewModels = new List<MainViewModel>();
-
-            InitializeComponent();
-
-            UnhandledException += OnUnhandledException;
-
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                LocalSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings),
-                RoamingSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings),
-                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
-                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(Constants.ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
-                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always))
-            };
-
-            var builder = new ContainerBuilder();
-            builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
-            builder.RegisterType<DefaultValueProvider>().As<IDefaultValueProvider>().SingleInstance();
-            builder.RegisterType<TrayProcessCommunicationService>().As<ITrayProcessCommunicationService>().SingleInstance();
-            builder.RegisterType<DialogService>().As<IDialogService>().SingleInstance();
-            builder.RegisterType<KeyboardCommandService>().As<IKeyboardCommandService>().InstancePerDependency();
-            builder.RegisterType<NotificationService>().As<INotificationService>().InstancePerDependency();
-            builder.RegisterType<UpdateService>().As<IUpdateService>().InstancePerDependency();
-            builder.RegisterType<MainViewModel>().InstancePerDependency();
-            builder.RegisterType<SettingsViewModel>().InstancePerDependency();
-            builder.RegisterType<ThemeParserFactory>().As<IThemeParserFactory>().SingleInstance();
-            builder.RegisterType<ITermThemeParser>().As<IThemeParser>().SingleInstance();
-            builder.RegisterType<FluentTerminalThemeParser>().As<IThemeParser>().SingleInstance();
-            builder.RegisterType<ClipboardService>().As<IClipboardService>().SingleInstance();
-            builder.RegisterType<FileSystemService>().As<IFileSystemService>().SingleInstance();
-            builder.RegisterType<SystemFontService>().As<ISystemFontService>().SingleInstance();
-            builder.RegisterType<ShellProfileSelectionDialog>().As<IShellProfileSelectionDialog>().InstancePerDependency();
-            builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
-            builder.RegisterType<InputDialog>().As<IInputDialog>().InstancePerDependency();
-            builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
-            builder.RegisterType<SshInfoDialog>().As<ISshConnectionInfoDialog>().InstancePerDependency();
-            builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
-            builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
-            builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
-            builder.RegisterInstance(applicationDataContainers);
-
-            _container = builder.Build();
-
-            _settingsService = _container.Resolve<ISettingsService>();
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-
-            _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
-
-            _applicationSettings = _settingsService.GetApplicationSettings();
-
-            JsonConvert.DefaultSettings = () =>
-            {
-                var settings = new JsonSerializerSettings
-                {
-                    ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                };
-                settings.Converters.Add(new StringEnumConverter(typeof(CamelCaseNamingStrategy)));
-
-                return settings;
-            };
-
-            _commandLineParser = new Parser(settings =>
-            {
-                settings.CaseSensitive = false;
-                settings.CaseInsensitiveEnumValues = true;
-            });
-        }
-
-        private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
-        {
-            Logger.Instance.Error(e.Exception, "Unhandled Exception");
-        }
-
-        private static IEnumerable<string> SplitArguments(string arguments)
-        {
-            var chars = arguments.ToCharArray();
-            var inQuote = false;
-
-            for (var i = 0; i < chars.Length; i++)
-            {
-                if (chars[i] == '"')
-                {
-                    inQuote = !inQuote;
-                }
-
-                if (!inQuote && chars[i] == ' ')
-                {
-                    chars[i] = '\n';
-                }
-            }
-
-            foreach (var value in new string(chars).Split('\n'))
-            {
-                yield return value.Trim('"');
-            }
-        }
-
-        protected override void OnActivated(IActivatedEventArgs args)
-        {
-            if (args is CommandLineActivatedEventArgs commandLineActivated)
-            {
-                if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
-                {
-                    return;
-                }
-
-                _commandLineParser.ParseArguments(SplitArguments(commandLineActivated.Operation.Arguments), typeof(NewVerb), typeof(RunVerb), typeof(SettingsVerb)).WithParsed(async verb =>
-                {
-                    if (verb is SettingsVerb)
-                    {
-                        await ShowSettings().ConfigureAwait(true);
-                    }
-                    else if (verb is NewVerb newVerb)
-                    {
-                        var profile = default(ShellProfile);
-                        if (!string.IsNullOrWhiteSpace(newVerb.Profile))
-                        {
-                            profile = _settingsService.GetShellProfiles().FirstOrDefault(x => x.Name.Equals(newVerb.Profile, StringComparison.CurrentCultureIgnoreCase));
-                        }
-
-                        if (profile == null)
-                        {
-                            profile = _settingsService.GetDefaultShellProfile();
-                        }
-
-                        if (!string.IsNullOrWhiteSpace(newVerb.Directory))
-                        {
-                            profile.WorkingDirectory = newVerb.Directory;
-                        }
-
-                        var location = newVerb.Target == Target.Default ? _applicationSettings.NewTerminalLocation
-                            : newVerb.Target == Target.Tab ? NewTerminalLocation.Tab
-                            : NewTerminalLocation.Window;
-
-                        await CreateTerminal(profile, location).ConfigureAwait(true);
-                    }
-                    else if (verb is RunVerb runVerb)
-                    {
-                        var profile = new ShellProfile
-                        {
-                            Id = Guid.Empty,
-                            Location = null,
-                            Arguments = runVerb.Command,
-                            WorkingDirectory = runVerb.Directory
-                        };
-
-                        if (!string.IsNullOrWhiteSpace(runVerb.Theme))
-                        {
-                            var theme = _settingsService.GetThemes().FirstOrDefault(x => x.Name.Equals(runVerb.Theme, StringComparison.CurrentCultureIgnoreCase));
-                            if (theme != null)
-                            {
-                                profile.TerminalThemeId = theme.Id;
-                            }
-                        }
-
-                        if (string.IsNullOrWhiteSpace(profile.WorkingDirectory))
-                        {
-                            profile.WorkingDirectory = commandLineActivated.Operation.CurrentDirectoryPath;
-                        }
-
-                        var location = runVerb.Target == Target.Default ? _applicationSettings.NewTerminalLocation
-                            : runVerb.Target == Target.Tab ? NewTerminalLocation.Tab
-                            : NewTerminalLocation.Window;
-
-                        await CreateTerminal(profile, location).ConfigureAwait(true);
-                    }
-                });
-            }
-        }
-
-        protected override async void OnLaunched(LaunchActivatedEventArgs args)
-        {
-            if (!_alreadyLaunched)
-            {
-                var logDirectory = await ApplicationData.Current.LocalCacheFolder.CreateFolderAsync("Logs", CreationCollisionOption.OpenIfExists);
-                var logFile = Path.Combine(logDirectory.Path, "fluentterminal.app.log");
-                var configFile = await logDirectory.CreateFileAsync("config.json", CreationCollisionOption.OpenIfExists);
-                var configContent = await FileIO.ReadTextAsync(configFile);
-
-                if (string.IsNullOrWhiteSpace(configContent))
-                {
-                    configContent = JsonConvert.SerializeObject(new Logger.Configuration());
-                    await FileIO.WriteTextAsync(configFile, configContent);
-                }
-
-                var config = JsonConvert.DeserializeObject<Logger.Configuration>(configContent) ?? new Logger.Configuration();
-
-                Logger.Instance.Initialize(logFile, config);
-
-                var viewModel = _container.Resolve<MainViewModel>();
-                viewModel.AddTerminal();
-                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
-                Window.Current.Activate();
-            }
-            else if (_mainViewModels.Count == 0)
-            {
-                await CreateSecondaryView<MainViewModel>(typeof(MainPage), true).ConfigureAwait(true);
-            }
-        }
-
-        protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
-        {
-            base.OnBackgroundActivated(args);
-
-            if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails details)
-            {
-                if (details.CallerPackageFamilyName == Package.Current.Id.FamilyName)
-                {
-                    _appServiceDeferral = args.TaskInstance.GetDeferral();
-                    args.TaskInstance.Canceled += OnTaskCanceled;
-
-                    _appServiceConnection = new AppServiceConnectionAdapter(details.AppServiceConnection);
-
-                    _trayReady.SetResult(0);
-                }
-            }
-        }
-
-        private void OnTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-        {
-            _appServiceDeferral?.Complete();
-            _appServiceDeferral = null;
-            _appServiceConnection = null;
-
-            Application.Current.Exit();
-        }
-
-        private async Task CreateMainView(Type pageType, INotifyPropertyChanged viewModel, bool extendViewIntoTitleBar)
-        {
-            await StartSystemTray().ConfigureAwait(true);
-
-            Frame rootFrame = Window.Current.Content as Frame;
-            if (rootFrame == null)
-            {
-                rootFrame = new Frame();
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
-
-                if (viewModel is MainViewModel mainViewModel)
-                {
-                    mainViewModel.Closed += OnMainViewModelClosed;
-                    mainViewModel.NewWindowRequested += OnNewWindowRequested;
-                    mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                    mainViewModel.ShowAboutRequested += OnShowAboutRequested;
-                    _mainViewModels.Add(mainViewModel);
-                }
-
-                rootFrame.Navigate(pageType, viewModel);
-            }
-            _alreadyLaunched = true;
-            Window.Current.Activate();
-        }
-
-        private async Task<MainViewModel> CreateNewTerminalWindow()
-        {
-            var viewModel = await CreateSecondaryView<MainViewModel>(typeof(MainPage), true).ConfigureAwait(true);
-            viewModel.Closed += OnMainViewModelClosed;
-            viewModel.NewWindowRequested += OnNewWindowRequested;
-            viewModel.ShowSettingsRequested += OnShowSettingsRequested;
-            viewModel.ShowAboutRequested += OnShowAboutRequested;
-            _mainViewModels.Add(viewModel);
-
-            return viewModel;
-        }
-
-        private async Task<TViewModel> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar)
-        {
-            int windowId = 0;
-            TViewModel viewModel = default;
-            await CoreApplication.CreateNewView().Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                viewModel = _container.Resolve<TViewModel>();
-
-                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
-                var frame = new Frame();
-                frame.Navigate(pageType, viewModel);
-                Window.Current.Content = frame;
-                Window.Current.Activate();
-
-                windowId = ApplicationView.GetForCurrentView().Id;
-            });
-
-            if (viewModel is SettingsViewModel settingsViewModel)
-            {
-                _settingsViewModel = settingsViewModel;
-                _settingsViewModel.Closed += OnSettingsClosed;
-                _settingsWindowId = windowId;
-            }
-
-            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(windowId);
-
-            return viewModel;
-        }
-
-        private void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
-        {
-            _applicationSettings = e;
-        }
-
-        private void OnMainViewModelClosed(object sender, EventArgs e)
-        {
-            if (sender is MainViewModel viewModel)
-            {
-                Logger.Instance.Debug("MainViewModel with ApplicationView Id: {@id} closed.", viewModel.ApplicationView.Id);
-
-                viewModel.Closed -= OnMainViewModelClosed;
-                viewModel.NewWindowRequested -= OnNewWindowRequested;
-                viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
-                viewModel.ShowAboutRequested -= OnShowAboutRequested;
-
-                _mainViewModels.Remove(viewModel);
-            }
-        }
-
-        private async void OnNewWindowRequested(object sender, NewWindowRequestedEventArgs e)
-        {
-            var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
-
-            if (e.ShowProfileSelection)
-            {
-                await viewModel.AddConfigurableTerminal().ConfigureAwait(true);
-            }
-            else
-            {
-                viewModel.AddTerminal();
-            }
-        }
-
-        private void OnSettingsClosed(object sender, EventArgs e)
-        {
-            _settingsViewModel.Closed -= OnSettingsClosed;
-            _settingsViewModel = null;
-            _settingsWindowId = null;
-        }
-
-        private void OnShowAboutRequested(object sender, EventArgs e)
-        {
-            ShowAbout().ConfigureAwait(true);
-        }
-
-        private async void OnShowSettingsRequested(object sender, EventArgs e)
-        {
-            await ShowSettings().ConfigureAwait(true);
-        }
-
-        private async Task ShowAbout()
-        {
-            await ShowSettings().ConfigureAwait(true);
-            _settingsViewModel.NavigateToAboutPage();
-        }
-
-        private async Task CreateTerminal(ShellProfile profile, NewTerminalLocation location)
-        {
-            if (!_alreadyLaunched)
-            {
-                var viewModel = _container.Resolve<MainViewModel>();
-                viewModel.AddTerminal(profile);
-                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
-            }
-            else if (location == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
-            {
-                _mainViewModels.Last().AddTerminal(profile);
-            }
-            else
-            {
-                var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
-                viewModel.AddTerminal(profile);
-            }
-        }
-
-        private async Task ShowSettings()
-        {
-            if (!_alreadyLaunched)
-            {
-                var viewModel = _container.Resolve<SettingsViewModel>();
-                await CreateMainView(typeof(SettingsPage), viewModel, true).ConfigureAwait(true);
-            }
-            else if (_settingsViewModel == null)
-            {
-                await CreateSecondaryView<SettingsViewModel>(typeof(SettingsPage), true).ConfigureAwait(true);
-            }
-            else
-            {
-                await ApplicationViewSwitcher.TryShowAsStandaloneAsync(_settingsWindowId.Value);
-            }
-        }
-
-        private async Task StartSystemTray()
-        {
-            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync("AppLaunchedParameterGroup").AsTask();
-            await Task.WhenAll(launch, _trayReady.Task).ConfigureAwait(true);
-            _trayProcessCommunicationService.Initialize(_appServiceConnection);
-        }
-    }
+using Autofac;
+using FluentTerminal.App.Adapters;
+using FluentTerminal.App.Dialogs;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.App.ViewModels;
+using FluentTerminal.App.Views;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.AppService;
+using Windows.ApplicationModel.Background;
+using Windows.ApplicationModel.Core;
+using Windows.Storage;
+using Windows.UI.Core;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using IContainer = Autofac.IContainer;
+
+namespace FluentTerminal.App
+{
+    public sealed partial class App : Application
+    {
+        public const string ThemesContainerName = "Themes";
+        public const string KeyBindingsContainerName = "KeyBindings";
+        public const string ShellProfilesContainerName = "ShellProfiles";
+
+        public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
+        private readonly ISettingsService _settingsService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private bool _alreadyLaunched;
+        private ApplicationSettings _applicationSettings;
+        private readonly IContainer _container;
+        private readonly List<MainViewModel> _mainViewModels;
+        private SettingsViewModel _settingsViewModel;
+        private int? _settingsWindowId;
+        private IAppServiceConnection _appServiceConnection;
+        private BackgroundTaskDeferral _appServiceDeferral;
+
+        public App()
+        {
+            _mainViewModels = new List<MainViewModel>();
+
+            InitializeComponent();
+
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                LocalSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings),
+                RoamingSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings),
+                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
+                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
+                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(ThemesContainerName, ApplicationDataCreateDisposition.Always))
+            };
+
+            var builder = new ContainerBuilder();
+            builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
+            builder.RegisterType<DefaultValueProvider>().As<IDefaultValueProvider>().SingleInstance();
+            builder.RegisterType<TrayProcessCommunicationService>().As<ITrayProcessCommunicationService>().SingleInstance();
+            builder.RegisterType<DialogService>().As<IDialogService>().SingleInstance();
+            builder.RegisterType<KeyboardCommandService>().As<IKeyboardCommandService>().InstancePerDependency();
+            builder.RegisterType<MainViewModel>().InstancePerDependency();
+            builder.RegisterType<SettingsViewModel>().InstancePerDependency();
+            builder.RegisterType<ThemeParserFactory>().As<IThemeParserFactory>().SingleInstance();
+            builder.RegisterType<ITermThemeParser>().As<IThemeParser>().SingleInstance();
+            builder.RegisterType<FluentTerminalThemeParser>().As<IThemeParser>().SingleInstance();
+            builder.RegisterType<ClipboardService>().As<IClipboardService>().SingleInstance();
+            builder.RegisterType<FileSystemService>().As<IFileSystemService>().SingleInstance();
+            builder.RegisterType<SystemFontService>().As<ISystemFontService>().SingleInstance();
+            builder.RegisterType<ShellProfileSelectionDialog>().As<IShellProfileSelectionDialog>().InstancePerDependency();
+            builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
+            builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
+            builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
+            builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
+            builder.RegisterInstance(applicationDataContainers);
+
+            _container = builder.Build();
+
+            _settingsService = _container.Resolve<ISettingsService>();
+            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+
+            _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
+
+            _applicationSettings = _settingsService.GetApplicationSettings();
+        }
+
+        protected override async void OnActivated(IActivatedEventArgs args)
+        {
+            if (args is CommandLineActivatedEventArgs commandLineActivated)
+            {
+                if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
+                {
+                    return;
+                }
+
+                var arguments = commandLineActivated.Operation.Arguments.Split(' ', 2);
+                var command = arguments[0];
+                var parameter = arguments.Length > 1 ? arguments[1] : string.Empty;
+
+                if (_alreadyLaunched)
+                {
+                    if (command == "settings")
+                    {
+                        await ShowSettings().ConfigureAwait(true);
+                    }
+                    else if (command == "new")
+                    {
+                        if (_applicationSettings.NewTerminalLocation == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
+                        {
+                            await _mainViewModels.Last().AddTerminal(parameter, false).ConfigureAwait(true);
+                        }
+                        else
+                        {
+                            await CreateNewTerminalWindow(parameter).ConfigureAwait(true);
+                        }
+                    }
+                }
+                else
+                {
+                    if (command == "settings")
+                    {
+                        var viewModel = _container.Resolve<SettingsViewModel>();
+                        await CreateMainView(typeof(SettingsPage), viewModel, true).ConfigureAwait(true);
+                    }
+                    else if (command == "new")
+                    {
+                        var viewModel = _container.Resolve<MainViewModel>();
+                        await viewModel.AddTerminal(parameter, false).ConfigureAwait(true);
+                        await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
+                    }
+                }
+            }
+        }
+
+        protected override async void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            if (!_alreadyLaunched)
+            {
+                var viewModel = _container.Resolve<MainViewModel>();
+                await viewModel.AddTerminal(null, false).ConfigureAwait(true);
+                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
+                Window.Current.Activate();
+            }
+            else if (_mainViewModels.Count == 0)
+            {
+                await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, string.Empty).ConfigureAwait(true);
+            }
+        }
+
+        protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
+        {
+            base.OnBackgroundActivated(args);
+
+            if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails details)
+            {
+                if (details.CallerPackageFamilyName == Package.Current.Id.FamilyName)
+                {
+                    _appServiceDeferral = args.TaskInstance.GetDeferral();
+                    args.TaskInstance.Canceled += OnTaskCanceled;
+
+                    _appServiceConnection = new AppServiceConnectionAdapter(details.AppServiceConnection);
+
+                    _trayReady.SetResult(0);
+                }
+            }
+        }
+
+        private void OnTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
+        {
+            _appServiceDeferral?.Complete();
+            _appServiceDeferral = null;
+            _appServiceConnection = null;
+
+            Application.Current.Exit();
+        }
+
+        private async Task CreateMainView(Type pageType, INotifyPropertyChanged viewModel, bool extendViewIntoTitleBar)
+        {
+            await StartSystemTray().ConfigureAwait(true);
+
+            Frame rootFrame = Window.Current.Content as Frame;
+            if (rootFrame == null)
+            {
+                rootFrame = new Frame();
+                Window.Current.Content = rootFrame;
+            }
+
+            if (rootFrame.Content == null)
+            {
+                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
+
+                if (viewModel is MainViewModel mainViewModel)
+                {
+                    mainViewModel.Closed += OnMainViewModelClosed;
+                    mainViewModel.NewWindowRequested += OnNewWindowRequested;
+                    mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
+                    _mainViewModels.Add(mainViewModel);
+                }
+
+                rootFrame.Navigate(pageType, viewModel);
+            }
+            _alreadyLaunched = true;
+            Window.Current.Activate();
+        }
+
+        private async Task CreateNewTerminalWindow(string startupDirectory)
+        {
+            var id = await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, startupDirectory).ConfigureAwait(true);
+            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(id);
+        }
+
+        private async Task<int> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar, object parameter)
+        {
+            int windowId = 0;
+            TViewModel viewModel = default;
+            await CoreApplication.CreateNewView().Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+            {
+                viewModel = _container.Resolve<TViewModel>();
+
+                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
+                var frame = new Frame();
+                frame.Navigate(pageType, viewModel);
+                Window.Current.Content = frame;
+                Window.Current.Activate();
+
+                windowId = ApplicationView.GetForCurrentView().Id;
+            });
+
+            if (viewModel is MainViewModel mainViewModel && parameter is string directory)
+            {
+                mainViewModel.Closed += OnMainViewModelClosed;
+                mainViewModel.NewWindowRequested += OnNewWindowRequested;
+                mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
+                _mainViewModels.Add(mainViewModel);
+                await mainViewModel.AddTerminal(directory, false).ConfigureAwait(true);
+            }
+
+            if (viewModel is SettingsViewModel settingsViewModel)
+            {
+                _settingsViewModel = settingsViewModel;
+                _settingsViewModel.Closed += OnSettingsClosed;
+            }
+
+            return windowId;
+        }
+
+        private void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        {
+            _applicationSettings = e;
+        }
+
+        private void OnMainViewModelClosed(object sender, EventArgs e)
+        {
+            if (sender is MainViewModel viewModel)
+            {
+                viewModel.Closed -= OnMainViewModelClosed;
+                viewModel.NewWindowRequested -= OnNewWindowRequested;
+                viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
+
+                _mainViewModels.Remove(viewModel);
+            }
+        }
+
+        private async void OnNewWindowRequested(object sender, EventArgs e)
+        {
+            await CreateNewTerminalWindow(string.Empty).ConfigureAwait(true);
+        }
+
+        private void OnSettingsClosed(object sender, EventArgs e)
+        {
+            _settingsViewModel.Closed -= OnSettingsClosed;
+            _settingsViewModel = null;
+            _settingsWindowId = null;
+        }
+
+        private async void OnShowSettingsRequested(object sender, EventArgs e)
+        {
+            await ShowSettings().ConfigureAwait(true);
+        }
+
+        private async Task ShowSettings()
+        {
+            if (_settingsViewModel == null)
+            {
+                _settingsWindowId = await CreateSecondaryView<SettingsViewModel>(typeof(SettingsPage), true, null).ConfigureAwait(true);
+            }
+            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(_settingsWindowId.Value);
+        }
+
+        private async Task StartSystemTray()
+        {
+            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync().AsTask();
+            var clearCache = WebView.ClearTemporaryWebDataAsync().AsTask();
+            await Task.WhenAll(launch, clearCache, _trayReady.Task).ConfigureAwait(true);
+            await _trayProcessCommunicationService.Initialize(_appServiceConnection).ConfigureAwait(true);
+        }
+    }
 }

FluentTerminal.App/CommandLineArguments/NewVerb.cs

@@ -1,17 +0,0 @@
-using CommandLine;
-
-namespace FluentTerminal.App.CommandLineArguments
-{
-    [Verb("new")]
-    public class NewVerb
-    {
-        [Value(0)]
-        public string Directory { get; set; }
-
-        [Option("profile")]
-        public string Profile { get; set; }
-
-        [Option("target")]
-        public Target Target { get; set; }
-    }
-}

FluentTerminal.App/CommandLineArguments/RunVerb.cs

@@ -1,20 +0,0 @@
-using CommandLine;
-
-namespace FluentTerminal.App.CommandLineArguments
-{
-    [Verb("run")]
-    public class RunVerb
-    {
-        [Value(0)]
-        public string Command { get; set; }
-
-        [Option("directory")]
-        public string Directory { get; set; }
-
-        [Option("theme")]
-        public string Theme { get; set; }
-
-        [Option("target")]
-        public Target Target { get; set; }
-    }
-}

FluentTerminal.App/CommandLineArguments/SettingsVerb.cs

@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace FluentTerminal.App.CommandLineArguments
-{
-    [Verb("settings")]
-    public class SettingsVerb
-    {
-    }
-}

FluentTerminal.App/CommandLineArguments/Target.cs

@@ -1,9 +0,0 @@
-namespace FluentTerminal.App.CommandLineArguments
-{
-    public enum Target
-    {
-        Default,
-        Tab,
-        Window
-    }
-}

FluentTerminal.App/Converters/BackgroundToApplicationThemeConverter.cs

@@ -14,8 +14,7 @@ namespace FluentTerminal.App.Converters
             if (value is string colorString)
             {
                 color = colorString.ToColor();
-            }
-            else if (value is Color)
+            } else if (value is Color)
             {
                 color = (Color)value;
             }
@@ -33,4 +32,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/ColorResourceKeyFallbackConverter.cs

@@ -1,31 +0,0 @@
-using Microsoft.Toolkit.Uwp.Helpers;
-using System;
-using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
-
-namespace FluentTerminal.App.Converters
-{
-    public class ColorResourceKeyFallbackConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value == null)
-            {
-                return Application.Current.Resources[(string)parameter];
-            }
-            else if (value is string hex)
-            {
-                var color = hex.ToColor();
-                return new SolidColorBrush(color);
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/EnumToDescriptionConverter.cs

@@ -1,24 +0,0 @@
-using System;
-using FluentTerminal.App.Services.Utilities;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class EnumToDescriptionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            // value is the Enum, parameter is the string.
-            if (value is Enum enumValue)
-            {
-                return EnumHelper.GetEnumDescription(enumValue);
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}

FluentTerminal.App/Converters/EnumValueToVisibiltyConverter.cs

@@ -1,23 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class EnumValueToVisibiltyConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value.GetType().IsEnum && Enum.TryParse(value.GetType(), parameter.ToString(), true, out object result))
-            {
-                return Equals(value, result) ? Visibility.Visible : Visibility.Collapsed;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/FalseToVisibleConverter.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Converters/IntToExtendedVirtualKeyConverter.cs

@@ -21,4 +21,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/NegateConverter.cs

@@ -19,4 +19,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/StringToColorConverter.cs

@@ -13,7 +13,6 @@ namespace FluentTerminal.App.Converters
             {
                 return colorString.FromString();
             }
-
             return null;
         }
 
@@ -26,4 +25,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Converters/TabColorFallbackConverter.cs

@@ -1,82 +0,0 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Microsoft.Toolkit.Uwp.Helpers;
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
-
-namespace FluentTerminal.App.Converters
-{
-    public class TabColorFallbackConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is TabTheme theme && Enum.TryParse<TabThemeKey>((string)parameter, true, out TabThemeKey tabThemeKey))
-            {
-                switch (tabThemeKey)
-                {
-                    case TabThemeKey.Background:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundOpacity);
-                    case TabThemeKey.BackgroundPointerOver:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundPointerOverOpacity);
-                    case TabThemeKey.BackgroundPressed:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundPressedOpacity);
-                    case TabThemeKey.BackgroundSelected:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedOpacity);
-                    case TabThemeKey.BackgroundSelectedPointerOver:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedPointerOverOpacity);
-                    case TabThemeKey.BackgroundSelectedPressed:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedPressedOpacity);
-                }
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        private Brush GetBrush(TabThemeKey tabThemeKey, string color, double opacity)
-        {
-            if (double.IsNaN(opacity))
-            {
-                return (Brush)Application.Current.Resources[GetFallbackRessourceKey(tabThemeKey)];
-            }
-            else
-            {
-                return CreateBrush(color, opacity);
-            }
-        }
-
-        private Brush CreateBrush(string hex, double opacity)
-        {
-            var color = hex.ToColor();
-            return new SolidColorBrush(color)
-            {
-                Opacity = opacity
-            };
-        }
-
-        private string GetFallbackRessourceKey(TabThemeKey tabThemeKey)
-        {
-            switch (tabThemeKey)
-            {
-                case TabThemeKey.Background:
-                    return "SystemControlTransparentBrush";
-                case TabThemeKey.BackgroundPointerOver:
-                    return "SystemControlHighlightListLowBrush";
-                case TabThemeKey.BackgroundPressed:
-                    return "SystemControlHighlightListMediumBrush";
-                case TabThemeKey.BackgroundSelected:
-                    return "SystemControlHighlightListAccentLowBrush";
-                case TabThemeKey.BackgroundSelectedPointerOver:
-                    return "SystemControlHighlightListAccentMediumBrush";
-                case TabThemeKey.BackgroundSelectedPressed:
-                    return "SystemControlHighlightListAccentHighBrush";
-            }
-            return null;
-        }
-    }
-}

FluentTerminal.App/Converters/TabThemeSelectedConverter.cs

@@ -1,23 +0,0 @@
-using FluentTerminal.Models;
-using System;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class TabThemeSelectedConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is TabTheme theme && parameter is string name)
-            {
-                return theme.Name == name;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/TerminalViewModelToViewConverter.cs

@@ -8,24 +8,24 @@ namespace FluentTerminal.App.Converters
 {
     internal class TerminalViewModelToViewConverter : IValueConverter
     {
-        private readonly Dictionary<TerminalViewModel, TerminalView> _viewDictionary;
+        private readonly Dictionary<int, TerminalView> _viewDictionary;
 
         public TerminalViewModelToViewConverter()
         {
-            _viewDictionary = new Dictionary<TerminalViewModel, TerminalView>();
+            _viewDictionary = new Dictionary<int, TerminalView>();
         }
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is TerminalViewModel terminal)
             {
-                if (_viewDictionary.TryGetValue(terminal, out TerminalView view))
+                if (_viewDictionary.TryGetValue(terminal.Id, out TerminalView view))
                 {
                     return view;
                 }
 
                 var newView = new TerminalView(terminal);
-                _viewDictionary.Add(terminal, newView);
+                _viewDictionary.Add(terminal.Id, newView);
                 return newView;
             }
             return null;

FluentTerminal.App/Converters/ToolTipValueToPixelConverter.cs

@@ -1,18 +0,0 @@
-using System;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class ToolTipValueToPixelConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            return string.Format("{0} px", value);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/TrueToBoldConverter.cs

@@ -1,23 +0,0 @@
-using System;
-using Windows.UI.Text;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class TrueToBoldConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is bool bold)
-            {
-                return bold ? FontWeights.Bold : FontWeights.Normal;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/TrueToVisibleConverter.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}