Revert "Implement different fody weavers to make development easier"

This reverts commit 32034af.

AUCapture-WPF/AUCapture-WPF.csproj

@@ -45,10 +45,6 @@
   <ItemGroup>
     <None Remove="Resources\Hats\103-1.png" />
     <None Remove="Resources\Hats\94-1.png" />
-    <None Remove="Resources\Misc\map-1.png" />
-    <None Remove="Resources\Misc\room_cafeteria.png" />
-    <None Remove="Resources\Misc\simsong.png" />
-    <None Remove="Resources\Misc\Stars.png" />
     <None Remove="Resources\Misc\status-connected.png" />
     <None Remove="Resources\Misc\status-disconnected.png" />
     <None Remove="Resources\Misc\voteCancel.png" />
@@ -74,7 +70,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bindables.Fody" Version="6.0.0" />
     <PackageReference Include="Config.Net" Version="4.15.0" />
     <PackageReference Include="Config.Net.Json" Version="4.15.0" />
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
@@ -84,7 +79,6 @@
     <PackageReference Include="MahApps.Metro.IconPacks.Unicons" Version="4.8.0" />
     <PackageReference Include="NLog" Version="4.7.6" />
     <PackageReference Include="Octokit" Version="0.48.0" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.3.1" />
     <PackageReference Include="SharedMemory" Version="2.2.3" />
     <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
   </ItemGroup>
@@ -201,9 +195,6 @@
     <Resource Include="Resources\Hats\92-1.png" />
     <Resource Include="Resources\Hats\93-1.png" />
     <Resource Include="Resources\Hats\94-1.png" />
-    <Resource Include="Resources\Misc\map-1.png" />
-    <Resource Include="Resources\Misc\simsong.png" />
-    <Resource Include="Resources\Misc\Stars.png" />
     <Resource Include="Resources\Misc\status-connected.png" />
     <Resource Include="Resources\Misc\status-disconnected.png" />
     <Resource Include="Resources\Pants\0.png" />

AUCapture-WPF/Controls/PlayerControl.xaml

@@ -14,6 +14,7 @@
         <converters1:HatToImage x:Key="HatToImage" />
         <converters1:HatToZ x:Key="HatToZ" />
         <converters1:PetToImageConverter x:Key="PetToIm" />
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
     </UserControl.Resources>
     <Viewbox Stretch="Uniform" VerticalAlignment="Center" Margin="0,0,0,0">

AUCapture-WPF/Controls/PlayerControl.xaml.cs

@@ -2,22 +2,74 @@
 using System.Windows;
 using System.Windows.Controls;
 using AmongUsCapture;
-using Bindables;
 
 namespace AUCapture_WPF.Controls
 {
     /// <summary>
     /// Interaction logic for PlayerControl.xaml
     /// </summary>
-    [DependencyProperty]
     public partial class PlayerControl : UserControl
     {
-        public bool AliveStatus { get; set; }
-        public uint PlayerHatID { get; set; }
-        public uint PlayerPetID { get; set; }
-        public uint PlayerPantsID { get; set; }
-        public string PlayerName { get;set; }
-        public PlayerColor Color { get; set; }
+        public static readonly DependencyProperty AliveProperty = 
+            DependencyProperty.Register("AliveStatus", 
+                typeof(bool), typeof(PlayerControl));
+
+        public static readonly DependencyProperty PlayerNameProperty = 
+            DependencyProperty.Register("PlayerName", 
+                typeof(string), typeof(PlayerControl));
+
+        public static readonly DependencyProperty PlayerHatDependencyProperty = 
+            DependencyProperty.Register("PlayerHatID", 
+                typeof(uint), typeof(PlayerControl));
+
+        public static readonly DependencyProperty PlayerPetDependencyProperty = 
+            DependencyProperty.Register("PlayerPetID", 
+                typeof(uint), typeof(PlayerControl));
+
+        public static readonly DependencyProperty PlayerPantsDependencyProperty = 
+            DependencyProperty.Register("PlayerPantsID", 
+                typeof(uint), typeof(PlayerControl));
+
+        public static readonly DependencyProperty ColorProperty = 
+            DependencyProperty.Register("Color", 
+                typeof(PlayerColor), typeof(PlayerControl));
+
+        private static void PropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Console.WriteLine("Prop changed");
+        }
+
+        public bool AliveStatus
+        {
+            get => (bool)GetValue(AliveProperty);
+            set => SetValue(AliveProperty, value);
+        }
+        public uint PlayerHatID
+        {
+            get => (uint)GetValue(PlayerHatDependencyProperty);
+            set => SetValue(PlayerHatDependencyProperty, value);
+        }
+
+        public uint PlayerPetID
+        {
+            get => (uint)GetValue(PlayerHatDependencyProperty);
+            set => SetValue(PlayerHatDependencyProperty, value);
+        }
+        public uint PlayerPantsID
+        {
+            get => (uint)GetValue(PlayerPantsDependencyProperty);
+            set => SetValue(PlayerPantsDependencyProperty, value);
+        }
+        public string PlayerName
+        {
+            get => (string)GetValue(PlayerNameProperty);
+            set => SetValue(PlayerNameProperty, value);
+        }
+        public PlayerColor Color
+        {
+            get => (PlayerColor)GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
         public PlayerControl()
         {
             InitializeComponent();

AUCapture-WPF/MainWindow.xaml.cs

@@ -599,7 +599,6 @@ private void GameStateChangedHandler(object sender, GameStateChangedEventArgs e)
                 Dispatcher.Invoke((Action) (() =>
                 {
                     context.GameState = e.NewState;
-                    context.GameMap = null;
                     foreach (var player in context.Players)
                     {
                         player.Alive = true;

AUCapture-WPF/UserDataContext.cs

@@ -35,7 +35,16 @@ public class UserDataContext : INotifyPropertyChanged
         private ICommand textBoxButtonHelpCmd;
         private ICommand openAmongUsCMD;
         public List<AccentColorMenuData> AccentColors { get; set; }
-        public bool? Connected { get; set; } = false;
+        private bool? _connected = false;
+        public bool? Connected
+        {
+            get => _connected;
+            set
+            {
+                _connected = value;
+                OnPropertyChanged();
+            }
+        }
         public class AccentColorMenuData
         {
             public string Name { get; set; }
@@ -140,19 +149,60 @@ protected virtual void DoChangeTheme(object sender)
                 }
             }
         };
+        private ObservableCollection<Player> _players = new ObservableCollection<Player>();
+        public ObservableCollection<Player> Players
+        {
+            get => _players;
+            set
+            {
+                _players = value;
+                OnPropertyChanged();
+            }
+        }
 
-        public ObservableCollection<Player> Players { get; set; } = new ObservableCollection<Player>();
-
-        public ObservableCollection<ConnectionStatus> ConnectionStatuses { get; set; } = new ObservableCollection<ConnectionStatus>();
+        private ObservableCollection<ConnectionStatus> _connectionStatuses = new ObservableCollection<ConnectionStatus>();
+        public ObservableCollection<ConnectionStatus> ConnectionStatuses
+        {
+            get => _connectionStatuses;
+            set
+            {
+                _connectionStatuses = value;
+                OnPropertyChanged();
+            }
+        }
 
-        public PlayMap? GameMap { get; set; }
+        private PlayMap? _gameMap;
+        public PlayMap? GameMap
+        {
+            get => _gameMap;
+            set
+            {
+                _gameMap = value;
+                OnPropertyChanged();
+            }
+        }
 
-        public string GameCode { get; set; }
-
+        private string _gameCode;
+        public string GameCode
+        {
+            get => _gameCode;
+            set
+            {
+                _gameCode = value;
+                OnPropertyChanged();
+            }
+        }
 
-
-        public GameState? GameState { get; set; }
-
+        private GameState? _gameState;
+        public GameState? GameState
+        {
+            get => _gameState;
+            set
+            {
+                _gameState = value;
+                OnPropertyChanged();
+            }
+        }
 
         private static void Shuffle<T>(List<T> list)
         {
@@ -212,6 +262,9 @@ public UserDataContext(IDialogCoordinator dialogCoordinator, IAppSettings settin
                 Console.WriteLine(e);
                 LatestVersion = "ERROR";
             }
+            OnPropertyChanged(nameof(LatestVersion));
+            OnPropertyChanged(nameof(Version));
+            OnPropertyChanged(nameof(AccentColors));