From 6d72ec973ee9c867f86a3dccf01ccab3dcae79ca Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Sun, 14 May 2023 02:05:38 +0100
Subject: [PATCH] Move auto channel change preference

moved to installation tab to make it clearer that it's related to channel preference
---
 Bloxstrap/ViewModels/BehaviourViewModel.cs    | 21 +------------------
 Bloxstrap/ViewModels/InstallationViewModel.cs | 15 +++++++++++++
 Bloxstrap/Views/Pages/BehaviourPage.xaml      |  9 --------
 Bloxstrap/Views/Pages/InstallationPage.xaml   |  9 ++++++++
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Bloxstrap/ViewModels/BehaviourViewModel.cs b/Bloxstrap/ViewModels/BehaviourViewModel.cs
index be4812e..86bb853 100644
--- a/Bloxstrap/ViewModels/BehaviourViewModel.cs
+++ b/Bloxstrap/ViewModels/BehaviourViewModel.cs
@@ -1,9 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using Bloxstrap.Enums;
-
-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.ViewModels
 {
     public class BehaviourViewModel
     {
@@ -24,19 +19,5 @@ namespace Bloxstrap.ViewModels
             get => App.Settings.Prop.MultiInstanceLaunching;
             set => App.Settings.Prop.MultiInstanceLaunching = value;
         }
-
-        // todo - move to enum attributes?
-        public IReadOnlyDictionary<string, ChannelChangeMode> ChannelChangeModes => new Dictionary<string, ChannelChangeMode>
-        {
-            { "Change automatically", ChannelChangeMode.Automatic },
-            { "Always prompt", ChannelChangeMode.Prompt },
-            { "Never change", ChannelChangeMode.Ignore },
-        };
-
-        public string SelectedChannelChangeMode
-        {
-            get => ChannelChangeModes.FirstOrDefault(x => x.Value == App.Settings.Prop.ChannelChangeMode).Key;
-            set => App.Settings.Prop.ChannelChangeMode = ChannelChangeModes[value];
-        }
     }
 }
diff --git a/Bloxstrap/ViewModels/InstallationViewModel.cs b/Bloxstrap/ViewModels/InstallationViewModel.cs
index 7eca88e..d64607b 100644
--- a/Bloxstrap/ViewModels/InstallationViewModel.cs
+++ b/Bloxstrap/ViewModels/InstallationViewModel.cs
@@ -10,6 +10,7 @@ using System.Windows.Input;
 
 using CommunityToolkit.Mvvm.Input;
 
+using Bloxstrap.Enums;
 using Bloxstrap.Models;
 
 namespace Bloxstrap.ViewModels
@@ -117,5 +118,19 @@ namespace Bloxstrap.ViewModels
         // 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>
+        {
+            { "Change automatically", ChannelChangeMode.Automatic },
+            { "Always prompt", ChannelChangeMode.Prompt },
+            { "Never change", ChannelChangeMode.Ignore },
+        };
+
+        public string SelectedChannelChangeMode
+        {
+            get => ChannelChangeModes.FirstOrDefault(x => x.Value == App.Settings.Prop.ChannelChangeMode).Key;
+            set => App.Settings.Prop.ChannelChangeMode = ChannelChangeModes[value];
+        }
     }
 }
diff --git a/Bloxstrap/Views/Pages/BehaviourPage.xaml b/Bloxstrap/Views/Pages/BehaviourPage.xaml
index 0ed442b..daaa9fe 100644
--- a/Bloxstrap/Views/Pages/BehaviourPage.xaml
+++ b/Bloxstrap/Views/Pages/BehaviourPage.xaml
@@ -40,14 +40,5 @@
             </ui:CardControl.Header>
             <ui:ToggleSwitch IsChecked="{Binding MultiInstanceLaunchingEnabled, Mode=TwoWay}" />
         </ui:CardControl>
-        <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
-            <ui:CardControl.Header>
-                <StackPanel>
-                    <TextBlock FontSize="14" Text="Choose what to do on suggested channel change" />
-                    <TextBlock Margin="0,2,0,0" FontSize="12" Text="Roblox or Bloxstrap may try to change your preferred release channel." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-                </StackPanel>
-            </ui:CardControl.Header>
-            <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding ChannelChangeModes.Keys, Mode=OneTime}" Text="{Binding SelectedChannelChangeMode, Mode=TwoWay}" />
-        </ui:CardControl>
     </StackPanel>
 </ui:UiPage>
diff --git a/Bloxstrap/Views/Pages/InstallationPage.xaml b/Bloxstrap/Views/Pages/InstallationPage.xaml
index ca4dc89..007f021 100644
--- a/Bloxstrap/Views/Pages/InstallationPage.xaml
+++ b/Bloxstrap/Views/Pages/InstallationPage.xaml
@@ -122,5 +122,14 @@
                 </Grid>
             </StackPanel>
         </ui:CardExpander>
+        <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+          <ui:CardControl.Header>
+            <StackPanel>
+              <TextBlock FontSize="14" Text="Automatic channel change action" />
+              <TextBlock Margin="0,2,0,0" FontSize="12" Text="Roblox or Bloxstrap may try to change your preferred channel." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+            </StackPanel>
+          </ui:CardControl.Header>
+        <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding ChannelChangeModes.Keys, Mode=OneTime}" Text="{Binding SelectedChannelChangeMode, Mode=TwoWay}" />
+      </ui:CardControl>
     </StackPanel>
 </ui:UiPage>