add an option to remember the entered IP address, closes #45

Author: ScanMountGoat

ArcExplorer/Models/ApplicationSettings.cs

@@ -45,6 +45,8 @@ public enum IntegerDisplayFormat
         // This ensures the first run of the program tries to check for updates.
         public DateTime LastHashesUpdateCheckTime { get; set; } = DateTime.UnixEpoch;
 
+        public string? ArcIpAddress { get; set; }
+
         private ApplicationSettings()
         {
 

ArcExplorer/ViewModels/OpenArcConnectionWindowViewModel.cs

@@ -0,0 +1,27 @@
+using ArcExplorer.Models;
+using Avalonia.Controls.ApplicationLifetimes;
+using ReactiveUI;
+using System;
+
+namespace ArcExplorer.ViewModels
+{
+    public class OpenArcConnectionWindowViewModel : ViewModelBase
+    {
+        // TODO: Does this need property changed?
+        public bool RememberIpAddress
+        {
+            get => rememberIpAddress;
+            set => this.RaiseAndSetIfChanged(ref rememberIpAddress, value);
+        }
+        private bool rememberIpAddress;
+
+        public bool WasCancelled { get; set; } = true;
+
+        public string IpAddress 
+        { 
+            get => ipAddress; 
+            set => this.RaiseAndSetIfChanged(ref ipAddress, value);
+        }
+        private string ipAddress = "000.000.000.000";
+    }
+}

ArcExplorer/Views/MainWindow.axaml.cs

@@ -92,14 +92,30 @@ public async void OpenArc()
 
         public async void OpenArcNetworked()
         {
-            var dialog = new OpenArcConnectionWindow();
+            var vm = new OpenArcConnectionWindowViewModel()
+            {
+                IpAddress = ApplicationSettings.Instance.ArcIpAddress ?? "000.000.000.000"
+            };
+
+            var dialog = new OpenArcConnectionWindow()
+            {
+                DataContext = vm
+            };
+
             dialog.Closed += (s, e) =>
             {
-                if (!dialog.WasCancelled)
+                if (!vm.WasCancelled)
                 {
-                    (DataContext as MainWindowViewModel)?.OpenArcNetworked(dialog.IpAddress);
+                    // Only save settings that were actually submitted.
+                    if (vm.RememberIpAddress)
+                    {
+                        ApplicationSettings.Instance.ArcIpAddress = vm.IpAddress;
+                    }
+
+                    (DataContext as MainWindowViewModel)?.OpenArcNetworked(vm.IpAddress);
                 }
             };
+
             await dialog.ShowDialog(this);
         }
 

ArcExplorer/Views/OpenArcConnectionWindow.axaml

@@ -2,19 +2,22 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="100"
-        Width="400" Height="100"
+        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="120"
+        Width="400" Height="120"
         x:Class="ArcExplorer.Views.OpenArcConnectionWindow"
-        WindowStartupLocation="CenterScreen"
         Icon="avares://ArcExplorer/Assets/arc.ico"
         Name="thisControl"
-        Title="Connect to ARC">
+        Title="Connect to ARC"
+        WindowStartupLocation="CenterOwner">
   <StackPanel Margin="10">
-    <Grid ColumnDefinitions="*,*">
-      <TextBlock Margin="5" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right">IP Address</TextBlock>
-      <TextBox Margin="5" Grid.Column="1" VerticalAlignment="Center" Text="{Binding IpAddress}"></TextBox>
+    <Grid ColumnDefinitions="*,*" RowDefinitions="*,*">
+      <TextBlock Margin="5" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left">IP Address</TextBlock>
+      <TextBox Margin="5" Grid.Column="1" VerticalAlignment="Center" Text="{Binding IpAddress}"
+               ToolTip.Tip="The IP address for the connection. This should be your Nintendo Switch's IP Address."></TextBox>
+      <CheckBox Margin="5" Grid.Row="1" Grid.Column="0" IsChecked="{Binding RememberIpAddress}" 
+                ToolTip.Tip="The IP address will be saved after clicking connect if checked.">Remember these settings</CheckBox>
     </Grid>
-    <Grid ColumnDefinitions="*,*">
+    <Grid ColumnDefinitions="*,*" DataContext="{Binding #thisControl}">
       <Button Grid.Column="0" Margin="5" Command="{Binding CancelClick}">Cancel</Button>
       <Button Grid.Column="1" Margin="5" Command="{Binding ConnectClick}">Connect</Button>
     </Grid>

ArcExplorer/Views/OpenArcConnectionWindow.axaml.cs

@@ -1,4 +1,6 @@
-using Avalonia.Controls;
+using ArcExplorer.Models;
+using ArcExplorer.ViewModels;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace ArcExplorer.Views
@@ -7,28 +9,28 @@ public class OpenArcConnectionWindow : Window
     {
         public OpenArcConnectionWindow()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = this;
         }
 
-        public bool WasCancelled { get; private set; } = true;
-
-        public string IpAddress { get; set; } = "000.000.000.000";
-
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
 
         public void ConnectClick()
         {
-            WasCancelled = false;
+            if (DataContext is OpenArcConnectionWindowViewModel vm)
+                vm.WasCancelled = false;
+
             Close();
         }
 
         public void CancelClick()
         {
-            WasCancelled = true;
+            if (DataContext is OpenArcConnectionWindowViewModel vm)
+                vm.WasCancelled = true;
+
             Close();
         }
     }