UI - Rename each OS assembly to Artemis 2

UI - Added auto-run
UI - Added auto-update

src/Artemis.UI/Screens/Root/RootViewModel.cs

@@ -21,14 +21,15 @@ namespace Artemis.UI.Screens.Root
 {
     public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvider
     {
-        private readonly IAssetLoader _assetLoader;
         private readonly DefaultTitleBarViewModel _defaultTitleBarViewModel;
         private readonly ICoreService _coreService;
-        private readonly IDebugService _debugService;
-        private readonly IClassicDesktopStyleApplicationLifetime _lifeTime;
         private readonly ISettingsService _settingsService;
-        private readonly ISidebarVmFactory _sidebarVmFactory;
         private readonly IWindowService _windowService;
+        private readonly IDebugService _debugService;
+        private readonly IUpdateService _updateService;
+        private readonly IAssetLoader _assetLoader;
+        private readonly IClassicDesktopStyleApplicationLifetime _lifeTime;
+        private readonly ISidebarVmFactory _sidebarVmFactory;
         private SidebarViewModel? _sidebarViewModel;
         private ViewModelBase? _titleBarViewModel;
 
@@ -38,6 +39,7 @@ namespace Artemis.UI.Screens.Root
             IWindowService windowService,
             IMainWindowService mainWindowService,
             IDebugService debugService,
+            IUpdateService updateService,
             IAssetLoader assetLoader,
             DefaultTitleBarViewModel defaultTitleBarViewModel,
             ISidebarVmFactory sidebarVmFactory)
@@ -48,6 +50,7 @@ namespace Artemis.UI.Screens.Root
             _settingsService = settingsService;
             _windowService = windowService;
             _debugService = debugService;
+            _updateService = updateService;
             _assetLoader = assetLoader;
             _defaultTitleBarViewModel = defaultTitleBarViewModel;
             _sidebarVmFactory = sidebarVmFactory;

src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml

@@ -6,6 +6,8 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:behaviors="clr-namespace:Artemis.UI.Shared.Behaviors;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="2400"
              x:Class="Artemis.UI.Screens.Settings.GeneralTabView"
              x:DataType="settings:GeneralTabViewModel">
@@ -18,40 +20,46 @@
 			</TextBlock>
 			<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
 				<StackPanel>
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0">
-							<TextBlock>Auto-run on startup</TextBlock>
-						</StackPanel>
-						<ToggleSwitch Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" IsChecked="{CompiledBinding UIAutoRun.Value}" MinWidth="0" Margin="0 -10"/>
-					</Grid>
-					<Separator Classes="card-separator" />
+					<StackPanel IsVisible="{CompiledBinding IsAutoRunSupported}">
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0">
+								<TextBlock>Auto-run on startup</TextBlock>
+							</StackPanel>
+							<ToggleSwitch Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" IsChecked="{CompiledBinding UIAutoRun.Value}" MinWidth="0" Margin="0 -10"/>
+						</Grid>
+						<Separator Classes="card-separator" />
 
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0">
-							<TextBlock>Hide window on auto-run</TextBlock>
-						</StackPanel>
-						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-							<ToggleSwitch IsChecked="{CompiledBinding !UIShowOnStartup.Value}" IsEnabled="{CompiledBinding UIAutoRun.Value}" MinWidth="0" Margin="0 -10"/>
-						</StackPanel>
-					</Grid>
-					<Separator Classes="card-separator" />
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0">
+								<TextBlock>Hide window on auto-run</TextBlock>
+							</StackPanel>
+							<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+								<ToggleSwitch IsChecked="{CompiledBinding !UIShowOnStartup.Value}" IsEnabled="{CompiledBinding UIAutoRun.Value}" MinWidth="0" Margin="0 -10"/>
+							</StackPanel>
+						</Grid>
+						<Separator Classes="card-separator" />
 
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0">
-							<TextBlock>Startup delay</TextBlock>
-							<TextBlock Classes="subtitle" TextWrapping="Wrap">
-								Set the amount of seconds to wait before auto-running Artemis.
-							</TextBlock>
-							<TextBlock Classes="subtitle" TextWrapping="Wrap">
-								If some devices don't work because Artemis starts before the manufacturer's software, try increasing this value.
-							</TextBlock>
-						</StackPanel>
-						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
-							<TextBox Text="{CompiledBinding UIAutoRunDelay.Value}" IsEnabled="{CompiledBinding UIAutoRun.Value}" Width="120" />
-							<TextBlock VerticalAlignment="Center" TextAlignment="Right" Width="30">sec</TextBlock>
-						</StackPanel>
-					</Grid>
-					<Separator Classes="card-separator" />
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0">
+								<TextBlock>Startup delay</TextBlock>
+								<TextBlock Classes="subtitle" TextWrapping="Wrap">
+									Set the amount of seconds to wait before auto-running Artemis.
+								</TextBlock>
+								<TextBlock Classes="subtitle" TextWrapping="Wrap">
+									If some devices don't work because Artemis starts before the manufacturer's software, try increasing this value.
+								</TextBlock>
+							</StackPanel>
+							<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+								<controls:NumberBox IsEnabled="{CompiledBinding UIAutoRun.Value}" Width="120">
+									<Interaction.Behaviors>
+										<behaviors:LostFocusNumberBoxBindingBehavior Value="{CompiledBinding UIAutoRunDelay.Value}"/>
+									</Interaction.Behaviors>
+								</controls:NumberBox>
+								<TextBlock VerticalAlignment="Center" TextAlignment="Right" Width="30">sec</TextBlock>
+							</StackPanel>
+						</Grid>
+						<Separator Classes="card-separator" />	
+					</StackPanel>
 					
 					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
 						<StackPanel Grid.Column="0">
@@ -103,48 +111,69 @@
 							</TextBlock>
 						</StackPanel>
 						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-							<TextBox Text="{CompiledBinding WebServerPort.Value}" Width="150" />
+							<controls:NumberBox Width="150">
+								<Interaction.Behaviors>
+									<behaviors:LostFocusNumberBoxBindingBehavior Value="{CompiledBinding WebServerPort.Value}"/>
+								</Interaction.Behaviors>
+							</controls:NumberBox>
 						</StackPanel>
 					</Grid>
 				</StackPanel>
 			</Border>
 
 			<!-- Update settings -->
-			<TextBlock Classes="h4" Margin="0 15">
-				Updating
-			</TextBlock>
-			<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
-				<StackPanel>
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0">
-							<TextBlock>
-								Check for updates
-							</TextBlock>
-							<TextBlock Classes="subtitle" TextWrapping="Wrap">
-								If enabled, we'll check for updates on startup and periodically while running.
-							</TextBlock>
-						</StackPanel>
-						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-							<ToggleSwitch IsChecked="{CompiledBinding UICheckForUpdates.Value}" MinWidth="0" />
-						</StackPanel>
-					</Grid>
-					<Separator Classes="card-separator" />
+			<StackPanel  IsVisible="{CompiledBinding IsUpdatingSupported}">
+				<TextBlock Classes="h4" Margin="0 15">
+					Updating
+				</TextBlock>
+				<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
+					<StackPanel>
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0">
+								<TextBlock>
+									Check for updates
+								</TextBlock>
+								<TextBlock Classes="subtitle" TextWrapping="Wrap">
+									If enabled, we'll check for updates on startup and periodically while running.
+								</TextBlock>
+							</StackPanel>
+							<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+								<ToggleSwitch IsChecked="{CompiledBinding UICheckForUpdates.Value}" MinWidth="0" />
+							</StackPanel>
+						</Grid>
+						<Separator Classes="card-separator" />
+						
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0">
+								<TextBlock>
+									Auto-install updates
+								</TextBlock>
+								<TextBlock Classes="subtitle" TextWrapping="Wrap">
+									If enabled, new updates will automatically be installed.
+								</TextBlock>
+							</StackPanel>
+							<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+								<ToggleSwitch IsEnabled="{CompiledBinding UICheckForUpdates.Value}" IsChecked="{CompiledBinding UIAutoUpdate.Value}" MinWidth="0" />
+							</StackPanel>
+						</Grid>
+						<Separator Classes="card-separator" />
 
-					<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-						<StackPanel Grid.Column="0" VerticalAlignment="Center">
-							<TextBlock>
-								Update
-							</TextBlock>
-							<TextBlock Classes="subtitle">
-								Use the button on the right to check for updates now.
-							</TextBlock>
-						</StackPanel>
-						<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-							<Button Command="{Binding OfferUpdatesIfFound}" Width="150" Content="Check now" />
-						</StackPanel>
-					</Grid>
-				</StackPanel>
-			</Border>
+						<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+							<StackPanel Grid.Column="0" VerticalAlignment="Center">
+								<TextBlock>
+									Update
+								</TextBlock>
+								<TextBlock Classes="subtitle">
+									Use the button on the right to check for updates now.
+								</TextBlock>
+							</StackPanel>
+							<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+								<Button Command="{CompiledBinding CheckForUpdate}" Width="150" Content="Check now" />
+							</StackPanel>
+						</Grid>
+					</StackPanel>
+				</Border>
+			</StackPanel>
 
 			<!-- Profile editor settings -->
 			<TextBlock Classes="h4" Margin="0 15">

src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs

@@ -9,14 +9,15 @@ using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.LayerBrushes;
+using Artemis.Core.Providers;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.StartupWizard;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Providers;
 using Artemis.UI.Shared.Services;
-using Avalonia;
+using Avalonia.Threading;
 using DynamicData;
-using FluentAvalonia.Styling;
 using Ninject;
 using ReactiveUI;
 using Serilog.Events;
@@ -29,20 +30,28 @@ namespace Artemis.UI.Screens.Settings
         private readonly ISettingsService _settingsService;
         private readonly IDebugService _debugService;
         private readonly IWindowService _windowService;
+        private readonly IUpdateService _updateService;
+        private readonly IAutoRunProvider? _autoRunProvider;
 
-        public GeneralTabViewModel(IKernel kernel, ISettingsService settingsService, IPluginManagementService pluginManagementService, IDebugService debugService, IWindowService windowService)
+        public GeneralTabViewModel(IKernel kernel,
+            ISettingsService settingsService,
+            IPluginManagementService pluginManagementService,
+            IDebugService debugService,
+            IWindowService windowService,
+            IUpdateService updateService)
         {
             DisplayName = "General";
             _settingsService = settingsService;
             _debugService = debugService;
             _windowService = windowService;
+            _updateService = updateService;
+            _autoRunProvider = kernel.TryGet<IAutoRunProvider>();
 
             List<LayerBrushProvider> layerBrushProviders = pluginManagementService.GetFeaturesOfType<LayerBrushProvider>();
+            List<IGraphicsContextProvider> graphicsContextProviders = kernel.Get<List<IGraphicsContextProvider>>();
             LayerBrushDescriptors = new ObservableCollection<LayerBrushDescriptor>(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors));
             GraphicsContexts = new ObservableCollection<string> {"Software"};
-            IGraphicsContextProvider? graphicsContextProvider = kernel.TryGet<IGraphicsContextProvider>();
-            if (graphicsContextProvider != null)
-                GraphicsContexts.AddRange(graphicsContextProvider.GraphicsContextNames);
+            GraphicsContexts.AddRange(graphicsContextProviders.Select(p => p.GraphicsContextName));
 
             _defaultLayerBrushDescriptor = _settingsService.GetSetting("ProfileEditor.DefaultLayerBrushDescriptor", new LayerBrushReference
             {
@@ -55,6 +64,21 @@ namespace Artemis.UI.Screens.Settings
             ShowSetupWizard = ReactiveCommand.CreateFromTask(ExecuteShowSetupWizard);
             ShowDebugger = ReactiveCommand.Create(ExecuteShowDebugger);
             ShowDataFolder = ReactiveCommand.Create(ExecuteShowDataFolder);
+
+            this.WhenActivated(d =>
+            {
+                UIAutoRun.SettingChanged += UIAutoRunOnSettingChanged;
+                UIAutoRunDelay.SettingChanged += UIAutoRunDelayOnSettingChanged;
+
+                Dispatcher.UIThread.InvokeAsync(ApplyAutoRun);
+                Disposable.Create(() =>
+                {
+                    UIAutoRun.SettingChanged -= UIAutoRunOnSettingChanged;
+                    UIAutoRunDelay.SettingChanged -= UIAutoRunDelayOnSettingChanged;
+                    
+                    _settingsService.SaveAllSettings();
+                }).DisposeWith(d);
+            });
         }
 
         public ReactiveCommand<Unit, Unit> ShowLogs { get; }
@@ -63,6 +87,9 @@ namespace Artemis.UI.Screens.Settings
         public ReactiveCommand<Unit, Unit> ShowDebugger { get; }
         public ReactiveCommand<Unit, Unit> ShowDataFolder { get; }
 
+        public bool IsAutoRunSupported => _autoRunProvider != null;
+        public bool IsUpdatingSupported => _updateService.UpdatingSupported;
+
         public ObservableCollection<LayerBrushDescriptor> LayerBrushDescriptors { get; }
         public ObservableCollection<string> GraphicsContexts { get; }
 
@@ -116,6 +143,7 @@ namespace Artemis.UI.Screens.Settings
         public PluginSetting<int> UIAutoRunDelay => _settingsService.GetSetting("UI.AutoRunDelay", 15);
         public PluginSetting<bool> UIShowOnStartup => _settingsService.GetSetting("UI.ShowOnStartup", true);
         public PluginSetting<bool> UICheckForUpdates => _settingsService.GetSetting("UI.CheckForUpdates", true);
+        public PluginSetting<bool> UIAutoUpdate => _settingsService.GetSetting("UI.AutoUpdate", false);
         public PluginSetting<bool> ProfileEditorShowDataModelValues => _settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false);
         public PluginSetting<LogEventLevel> CoreLoggingLevel => _settingsService.GetSetting("Core.LoggingLevel", LogEventLevel.Information);
         public PluginSetting<string> CorePreferredGraphicsContext => _settingsService.GetSetting("Core.PreferredGraphicsContext", "Software");
@@ -123,26 +151,17 @@ namespace Artemis.UI.Screens.Settings
         public PluginSetting<int> CoreTargetFrameRate => _settingsService.GetSetting("Core.TargetFrameRate", 30);
         public PluginSetting<int> WebServerPort => _settingsService.GetSetting("WebServer.Port", 9696);
 
-        #region General
-
         private void ExecuteShowLogs()
         {
-            OpenFolder(Constants.LogsFolder);
+            Utilities.OpenFolder(Constants.LogsFolder);
         }
 
-        #endregion
 
-        #region Updating
-
-        private Task ExecuteCheckForUpdate(CancellationToken cancellationToken)
+        private async Task ExecuteCheckForUpdate(CancellationToken cancellationToken)
         {
-            return Task.CompletedTask;
+            await _updateService.ManualUpdate();
         }
 
-        #endregion
-
-        #region Tools
-
         private async Task ExecuteShowSetupWizard()
         {
             await _windowService.ShowDialogAsync<StartupWizardViewModel, bool>();
@@ -153,19 +172,46 @@ namespace Artemis.UI.Screens.Settings
             _debugService.ShowDebugger();
         }
 
-
         private void ExecuteShowDataFolder()
         {
-            OpenFolder(Constants.DataFolder);
+            Utilities.OpenFolder(Constants.DataFolder);
         }
 
-        #endregion
-
-        private void OpenFolder(string path)
+        private async Task ApplyAutoRun()
         {
-            if (OperatingSystem.IsWindows())
+            if (_autoRunProvider == null)
+                return;
+
+            try
             {
-                Process.Start(Environment.GetEnvironmentVariable("WINDIR") + @"\explorer.exe", path);
+                if (UIAutoRun.Value)
+                    await _autoRunProvider.EnableAutoRun(false, UIAutoRunDelay.Value);
+                else
+                    await _autoRunProvider.DisableAutoRun();
+            }
+            catch (Exception exception)
+            {
+                _windowService.ShowExceptionDialog("Failed to apply auto-run", exception);
+            }
+        }
+
+        private async void UIAutoRunOnSettingChanged(object? sender, EventArgs e)
+        {
+            await ApplyAutoRun();
+        }
+
+        private async void UIAutoRunDelayOnSettingChanged(object? sender, EventArgs e)
+        {
+            if (_autoRunProvider == null || !UIAutoRun.Value)
+                return;
+
+            try
+            {
+                await _autoRunProvider.EnableAutoRun(true, UIAutoRunDelay.Value);
+            }
+            catch (Exception exception)
+            {
+                _windowService.ShowExceptionDialog("Failed to apply auto-run", exception);
             }
         }
     }