From 054379d4f0faf57d1c144a1ee6a711fc37fc80c0 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Thu, 13 Jul 2023 13:15:03 +0100
Subject: [PATCH] Channel selection - editable textbox, error icon

---
 .../UI/Elements/Menu/Pages/BehaviourPage.xaml | 94 +++++++++----------
 .../Elements/Menu/Pages/BehaviourPage.xaml.cs |  8 +-
 .../UI/ViewModels/Menu/BehaviourViewModel.cs  | 36 ++++---
 3 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml
index 61d4049..0c193c2 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml
@@ -42,66 +42,58 @@
             <TextBlock FontSize="14" Text="Deployment channel" />
             <TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose which release channel Roblox should be downloaded from." Foreground="{DynamicResource TextFillColorTertiaryBrush}"  />
           </StackPanel>
-          <ComboBox Grid.Column="1" Margin="8,0,8,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding Channels, Mode=OneWay}" SelectedItem="{Binding Channel, Mode=TwoWay}" Visibility="{Binding ChannelComboBoxVisibility, Mode=OneWay}" />
-          <ui:TextBox Grid.Column="1"  Margin="8,0,8,0" Padding="10,5,10,5" Width="200" Text="{Binding Channel, Mode=TwoWay}" Visibility="{Binding ChannelTextBoxVisibility, Mode=OneWay}" KeyUp="TextBox_KeyEnterUpdate" />
+          <ComboBox Grid.Column="1" Margin="8,0,8,0" Padding="10,5,10,5" Width="200" IsEditable="True" ItemsSource="{Binding Channels, Mode=OneWay}" Text="{Binding SelectedChannel, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" KeyUp="ComboBox_KeyEnterUpdate" />
         </Grid>
       </ui:CardExpander.Header>
       <StackPanel>
-        <Grid>
+        <Grid Margin="0,0,4,0">
+          <Grid.Style>
+            <Style>
+              <Setter Property="Grid.Visibility" Value="Visible"/>
+              <Style.Triggers>
+                <DataTrigger Binding="{Binding ChannelDeployInfo}" Value="{x:Null}">
+                  <Setter Property="Grid.Visibility" Value="Collapsed" />
+                </DataTrigger>
+              </Style.Triggers>
+            </Style>
+          </Grid.Style>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+          </Grid.RowDefinitions>
           <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
           </Grid.ColumnDefinitions>
-          <Grid Column="0" Margin="0,0,4,0">
-            <Grid.Style>
-              <Style>
-                <Setter Property="Grid.Visibility" Value="Visible"/>
-                <Style.Triggers>
-                  <DataTrigger Binding="{Binding ChannelDeployInfo}" Value="{x:Null}">
-                    <Setter Property="Grid.Visibility" Value="Collapsed" />
-                  </DataTrigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Style>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="*" />
-              <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="Version" />
-            <TextBlock Grid.Row="0" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Version, Mode=OneWay}" />
+          <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="Version" />
+          <TextBlock Grid.Row="0" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Version, Mode=OneWay}" />
 
-            <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="VersionGuid" />
-            <TextBlock Grid.Row="1" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.VersionGuid, Mode=OneWay}" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="VersionGuid" />
+          <TextBlock Grid.Row="1" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.VersionGuid, Mode=OneWay}" />
 
-            <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,0" VerticalAlignment="Center" Text="Deployed" />
-            <TextBlock Grid.Row="2" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Timestamp, Mode=OneWay}" />
-          </Grid>
-          <Grid Column="0">
-            <Grid.Style>
-              <Style>
-                <Setter Property="Grid.Visibility" Value="Collapsed"/>
-                <Style.Triggers>
-                  <DataTrigger Binding="{Binding ChannelDeployInfo}" Value="{x:Null}">
-                    <Setter Property="Grid.Visibility" Value="Visible" />
-                  </DataTrigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Style>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <ui:ProgressRing Grid.Column="0" Margin="6" IsIndeterminate="True" />
-            <TextBlock Grid.Column="1" Margin="16" VerticalAlignment="Center" Text="{Binding ChannelInfoLoadingText, Mode=OneWay}" />
-          </Grid>
-
-          <CheckBox Grid.Column="1" Margin="4,0,0,0" Content="Manually enter channel name" VerticalAlignment="Top" IsChecked="{Binding ManualChannelEntry, Mode=TwoWay}" />
+          <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,0" VerticalAlignment="Center" Text="Deployed" />
+          <TextBlock Grid.Row="2" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.Timestamp, Mode=OneWay}" />
+        </Grid>
+        <Grid Column="0">
+          <Grid.Style>
+            <Style>
+              <Setter Property="Grid.Visibility" Value="Collapsed"/>
+              <Style.Triggers>
+                <DataTrigger Binding="{Binding ChannelDeployInfo}" Value="{x:Null}">
+                  <Setter Property="Grid.Visibility" Value="Visible" />
+                </DataTrigger>
+              </Style.Triggers>
+            </Style>
+          </Grid.Style>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+          <ui:ProgressRing Grid.Column="0" Margin="6" IsIndeterminate="True" Visibility="{Binding LoadingSpinnerVisibility, Mode=OneWay}" />
+          <Image Grid.Column="0" Margin="6" Width="60" Height="60" Visibility="{Binding LoadingErrorVisibility, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" />
+          <TextBlock Grid.Column="1" Margin="16" VerticalAlignment="Center" Text="{Binding ChannelInfoLoadingText, Mode=OneWay}" />
         </Grid>
       </StackPanel>
     </ui:CardExpander>
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs
index a1627f7..db864e1 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs
+++ b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs
@@ -20,14 +20,14 @@ namespace Bloxstrap.UI.Menu.Pages
 
         // https://stackoverflow.com/a/13289118/11852173
         // yes this doesnt fully conform to xaml but whatever
-        private void TextBox_KeyEnterUpdate(object sender, KeyEventArgs e)
+        private void ComboBox_KeyEnterUpdate(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
-                TextBox tBox = (TextBox)sender;
-                DependencyProperty prop = TextBox.TextProperty;
+                ComboBox box = (ComboBox)sender;
+                DependencyProperty prop = ComboBox.TextProperty;
 
-                BindingExpression binding = BindingOperations.GetBindingExpression(tBox, prop);
+                BindingExpression binding = BindingOperations.GetBindingExpression(box, prop);
 
                 if (binding is not null)
                     binding.UpdateSource();
diff --git a/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs
index 78661f3..6c19562 100644
--- a/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs
@@ -26,10 +26,14 @@ namespace Bloxstrap.UI.ViewModels.Menu
 
         private async Task LoadChannelDeployInfo(string channel)
         {
+            LoadingSpinnerVisibility = Visibility.Visible;
+            LoadingErrorVisibility = Visibility.Collapsed;
             ChannelInfoLoadingText = "Fetching latest deploy info, please wait...";
-            OnPropertyChanged(nameof(ChannelInfoLoadingText));
-
             ChannelDeployInfo = null;
+
+            OnPropertyChanged(nameof(LoadingSpinnerVisibility));
+            OnPropertyChanged(nameof(LoadingErrorVisibility));
+            OnPropertyChanged(nameof(ChannelInfoLoadingText));
             OnPropertyChanged(nameof(ChannelDeployInfo));
 
             try
@@ -47,11 +51,19 @@ namespace Bloxstrap.UI.ViewModels.Menu
             }
             catch (Exception)
             {
-                ChannelInfoLoadingText = "Failed to get deploy info.\nIs the channel name valid?";
+                LoadingSpinnerVisibility = Visibility.Collapsed;
+                LoadingErrorVisibility = Visibility.Visible;
+                ChannelInfoLoadingText = "Could not get deployment information. Is the channel name valid?";
+
+                OnPropertyChanged(nameof(LoadingSpinnerVisibility));
+                OnPropertyChanged(nameof(LoadingErrorVisibility));
                 OnPropertyChanged(nameof(ChannelInfoLoadingText));
             }
         }
 
+        public Visibility LoadingSpinnerVisibility { get; private set; } = Visibility.Visible;
+        public Visibility LoadingErrorVisibility { get; private set; } = Visibility.Collapsed;
+
         public DeployInfo? ChannelDeployInfo { get; private set; } = null;
         public string ChannelInfoLoadingText { get; private set; } = null!;
 
@@ -69,12 +81,16 @@ namespace Bloxstrap.UI.ViewModels.Menu
 
         public IEnumerable<string> Channels => RobloxDeployment.SelectableChannels;
 
-        public string Channel
+        public string SelectedChannel
         {
             get => App.Settings.Prop.Channel;
             set
             {
                 value = value.Trim();
+
+                if (String.IsNullOrEmpty(value))
+                    value = RobloxDeployment.DefaultChannel;
+                
                 Task.Run(() => LoadChannelDeployInfo(value));
                 App.Settings.Prop.Channel = value;
             }
@@ -90,20 +106,14 @@ namespace Bloxstrap.UI.ViewModels.Menu
                 if (!value)
                 {
                     // roblox typically sets channels in all lowercase, so here we find if a case insensitive match exists
-                    string? matchingChannel = Channels.Where(x => x.ToLowerInvariant() == Channel.ToLowerInvariant()).FirstOrDefault();
-                    Channel = string.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel;
+                    string? matchingChannel = Channels.Where(x => x.ToLowerInvariant() == SelectedChannel.ToLowerInvariant()).FirstOrDefault();
+                    SelectedChannel = string.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel;
                 }
 
-                OnPropertyChanged(nameof(Channel));
-                OnPropertyChanged(nameof(ChannelComboBoxVisibility));
-                OnPropertyChanged(nameof(ChannelTextBoxVisibility));
+                OnPropertyChanged(nameof(SelectedChannel));
             }
         }
 
-        // cant use data bindings so i have to do whatever tf this is
-        public Visibility ChannelComboBoxVisibility => ManualChannelEntry ? Visibility.Collapsed : Visibility.Visible;
-        public Visibility ChannelTextBoxVisibility => ManualChannelEntry ? Visibility.Visible : Visibility.Collapsed;
-
         // todo - move to enum attributes?
         public IReadOnlyDictionary<string, ChannelChangeMode> ChannelChangeModes => new Dictionary<string, ChannelChangeMode>
         {