From a958a5d43238fa4110481d5526db6f3074351b03 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Sun, 9 May 2021 22:33:01 -0400
Subject: [PATCH 01/14] refactor(ItemDataTemplate): add DataType property to
 make the template implicit instead of providing the data template as a
 dependency property

---
 ItemBoxTracker/GUI/AutoSuggestBox.xaml    |  6 ++----
 ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs | 11 -----------
 ItemBoxTracker/GUI/ItemDataTemplate.xaml  |  3 ++-
 ItemBoxTracker/GUI/SettingsTab.xaml       |  1 -
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
index d2f513a..d607464 100644
--- a/ItemBoxTracker/GUI/AutoSuggestBox.xaml
+++ b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
@@ -78,8 +78,7 @@
             </Grid.ColumnDefinitions>
             <ContentControl
                 Grid.Column='0'
-                Content="{Binding Selection}"
-                ContentTemplate="{Binding ItemTemplate}" />
+                Content="{Binding Selection}" />
             <Button
                 Grid.Column='1'
                 Style="{StaticResource ButtonOverride}"
@@ -109,8 +108,7 @@
         <ListBox
             x:Name="suggestionsList"
             Background="{x:Null}"
-            SelectionChanged="SelectionChanged"
-            ItemTemplate="{Binding ItemTemplate}" />
+            SelectionChanged="SelectionChanged" />
 
         <TextBlock
             x:Name="noResults"
diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs b/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
index 834feae..0969a55 100644
--- a/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
+++ b/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
@@ -91,17 +91,6 @@ public object Selection {
       get { return (object)GetValue(SelectionProperty); }
       set { SetValue(SelectionProperty, value); }
     }
-    public static readonly DependencyProperty ItemTemplateProperty = DependencyProperty.Register(
-    "ItemTemplate", typeof(DataTemplate), typeof(AutoSuggestBox), new PropertyMetadata(default(DataTemplate)));
-    /// <value>
-    /// DependencyProperty <c>ItemTemplate</c>
-    /// is the <c>DataTemplate</c> used to display the individual search results and auto filled selection.
-    /// Default simply uses ToString()
-    /// </value>
-    public string ItemTemplate {
-      get { return (string)GetValue(ItemTemplateProperty); }
-      set { SetValue(ItemTemplateProperty, value); }
-    }
 
     public AutoSuggestBox() {
       OnEnter = new RelayCommand(i => onEnter(i as string));
diff --git a/ItemBoxTracker/GUI/ItemDataTemplate.xaml b/ItemBoxTracker/GUI/ItemDataTemplate.xaml
index deaef6d..d4a3502 100644
--- a/ItemBoxTracker/GUI/ItemDataTemplate.xaml
+++ b/ItemBoxTracker/GUI/ItemDataTemplate.xaml
@@ -1,8 +1,9 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:data="clr-namespace:MHWItemBoxTracker.ViewModels"
     xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter">
-  <DataTemplate x:Key="ItemDataTemplate">
+  <DataTemplate DataType="{x:Type data:ItemViewModel}">
     <StackPanel Orientation="Horizontal">
       <StackPanel.ToolTip>
         <StackPanel>
diff --git a/ItemBoxTracker/GUI/SettingsTab.xaml b/ItemBoxTracker/GUI/SettingsTab.xaml
index 025376b..8aa4317 100644
--- a/ItemBoxTracker/GUI/SettingsTab.xaml
+++ b/ItemBoxTracker/GUI/SettingsTab.xaml
@@ -97,7 +97,6 @@
                         Placeholder="Search items..."
                         NoResultsText="{Binding DataContext.Items.Count, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={convert:CountToString Zero=Please launch the game to enable this search and then reload this screen once HunterPie has loaded the strings, More=No Results...}}"
                         Selection="{Binding DataContext, RelativeSource={RelativeSource AncestorType=StackPanel}, Mode=TwoWay}"
-                        ItemTemplate="{StaticResource ItemDataTemplate}"
                         OnTextChanged="OnTextChanged"
                         OnSuggestionChosen="OnSuggestionChosen"
                         OnClearSelection="OnClearSelection"

From d6c7858c8bbde61c58450666c2d77dcf6e065ad7 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Sun, 9 May 2021 22:48:34 -0400
Subject: [PATCH 02/14] refactor(ButtonOverride): use TargetType without name
 to use this button style implicitly

---
 ItemBoxTracker/GUI/AutoSuggestBox.xaml | 14 ++++----------
 ItemBoxTracker/GUI/ButtonOverride.xaml |  4 +---
 ItemBoxTracker/GUI/Settings.xaml       |  8 ++++++++
 ItemBoxTracker/GUI/SettingsTab.xaml    | 15 +--------------
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
index d607464..45181aa 100644
--- a/ItemBoxTracker/GUI/AutoSuggestBox.xaml
+++ b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
@@ -12,15 +12,10 @@
     d:DesignWidth="200">
   <UserControl.Resources>
     <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ButtonOverride.xaml" />
-        <ResourceDictionary>
-          <convert:BooleanToVisibilityConverter
-              x:Key="InverseBool2Visibility"
-              FalseValue="Visible"
-              TrueValue="Hidden" />
-        </ResourceDictionary>
-      </ResourceDictionary.MergedDictionaries>
+      <convert:BooleanToVisibilityConverter
+          x:Key="InverseBool2Visibility"
+          FalseValue="Visible"
+          TrueValue="Hidden" />
     </ResourceDictionary>
   </UserControl.Resources>
 
@@ -81,7 +76,6 @@
                 Content="{Binding Selection}" />
             <Button
                 Grid.Column='1'
-                Style="{StaticResource ButtonOverride}"
                 Foreground="#cc9E9D9D"
                 Click="ClearSelection"
                 Content="✘" />
diff --git a/ItemBoxTracker/GUI/ButtonOverride.xaml b/ItemBoxTracker/GUI/ButtonOverride.xaml
index 30ebee1..743ca6c 100644
--- a/ItemBoxTracker/GUI/ButtonOverride.xaml
+++ b/ItemBoxTracker/GUI/ButtonOverride.xaml
@@ -1,9 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style
-      TargetType="Button"
-      x:Key="ButtonOverride">
+  <Style TargetType="Button">
     <Setter
         Property="Cursor"
         Value="Hand" />
diff --git a/ItemBoxTracker/GUI/Settings.xaml b/ItemBoxTracker/GUI/Settings.xaml
index 08b9594..5879208 100644
--- a/ItemBoxTracker/GUI/Settings.xaml
+++ b/ItemBoxTracker/GUI/Settings.xaml
@@ -11,6 +11,14 @@
     d:DesignWidth="800"
     Loaded="OnLoaded"
     mc:Ignorable="d">
+  <UserControl.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ItemDataTemplate.xaml" />
+        <ResourceDictionary Source="ButtonOverride.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </UserControl.Resources>
   <TabControl BorderThickness="0">
     <TabControl.Background>
       <SolidColorBrush
diff --git a/ItemBoxTracker/GUI/SettingsTab.xaml b/ItemBoxTracker/GUI/SettingsTab.xaml
index 8aa4317..47b1f1c 100644
--- a/ItemBoxTracker/GUI/SettingsTab.xaml
+++ b/ItemBoxTracker/GUI/SettingsTab.xaml
@@ -12,17 +12,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-  <UserControl.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ButtonOverride.xaml" />
-        <ResourceDictionary Source="ItemDataTemplate.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </UserControl.Resources>
-
-  <StackPanel x:Name="settingsTab">
-
+  <StackPanel>
 
     <Grid HorizontalAlignment="Center">
       <Grid.ColumnDefinitions>
@@ -84,12 +74,10 @@
                 <DataTemplate>
                   <StackPanel Orientation="Horizontal">
                     <Button
-                        Style="{StaticResource ButtonOverride}"
                         ToolTip="Move up"
                         Click="MoveUp"
                         Content="▲" />
                     <Button
-                        Style="{StaticResource ButtonOverride}"
                         ToolTip="Move down"
                         Click="MoveDown"
                         Content="▼" />
@@ -107,7 +95,6 @@
                         Width="100"
                         Text="{Binding Amount, Mode=TwoWay}" />
                     <Button
-                        Style="{StaticResource ButtonOverride}"
                         ToolTip="Delete row"
                         Foreground="Red"
                         Click="DeleteRow"

From a95b8f7891eb1aa9e7989682ee69acb98268d426 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 02:04:47 -0400
Subject: [PATCH 03/14] refactor(AutoSuggestBox): use MVVM for AutoSuggestBox

---
 ItemBoxTracker/GUI/AutoSuggestBox.xaml        |  55 +++++---
 ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs     | 127 +++++-------------
 ItemBoxTracker/ItemBoxTracker.csproj          |   5 +
 ItemBoxTracker/Utils/Focuser.cs               |  21 +++
 ItemBoxTracker/Utils/NotifyPropertyChanged.cs |   3 +
 .../ViewModels/AutoSuggestBoxViewModel.cs     | 115 ++++++++++++++++
 6 files changed, 214 insertions(+), 112 deletions(-)
 create mode 100644 ItemBoxTracker/Utils/Focuser.cs
 create mode 100644 ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs

diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
index 45181aa..6960983 100644
--- a/ItemBoxTracker/GUI/AutoSuggestBox.xaml
+++ b/ItemBoxTracker/GUI/AutoSuggestBox.xaml
@@ -12,20 +12,30 @@
     d:DesignWidth="200">
   <UserControl.Resources>
     <ResourceDictionary>
-      <convert:BooleanToVisibilityConverter
-          x:Key="InverseBool2Visibility"
-          FalseValue="Visible"
-          TrueValue="Hidden" />
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary>
+          <convert:BooleanToVisibilityConverter
+              x:Key="InverseBool2Visibility"
+              FalseValue="Visible"
+              TrueValue="Hidden" />
+        </ResourceDictionary>
+        <ResourceDictionary>
+          <convert:LengthToVisibilityConverter
+              x:Key="EmptyToVisible"
+              WhenEmpty="Visible"
+              WhenValues="Hidden" />
+        </ResourceDictionary>
+      </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </UserControl.Resources>
 
-  <StackPanel DataContext="{Binding ElementName=AutoSuggest}">
+  <StackPanel x:Name="Root">
     <Border
         BorderBrush="#FFABADB3"
         BorderThickness="0 0 0 1"
         Padding="5 0"
         Background="{x:Null}"
-        Width="{Binding ActualWidth}"
+        Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=UserControl}}"
         Height="30">
       <Grid VerticalAlignment="Center">
         <Grid.ColumnDefinitions>
@@ -35,20 +45,20 @@
 
         <TextBlock
             Grid.Column='0'
-            Text="{Binding Placeholder}"
+            Text="{Binding Placeholder, RelativeSource={RelativeSource AncestorType=UserControl}}"
             Foreground="#cc9E9D9D"
             Visibility="{Binding Text.IsEmpty, ElementName=searchInput, Converter={convert:BooleanToVisibilityConverter}}" />
         <TextBox
             Grid.Column='0'
+            Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            IsEnabled="{Binding IsEnabled, Mode=TwoWay}"
             x:Name="searchInput"
             BorderThickness="0"
-            Foreground="#ffbfbfbf"
-            TextChanged="TextChanged">
+            Foreground="#ffbfbfbf">
           <TextBox.InputBindings>
             <KeyBinding
                 Key="Enter"
-                Command="{Binding OnEnter}"
-                CommandParameter="{Binding ElementName=searchInput, Path=Text}" />
+                Command="{Binding OnEnter}" />
             <KeyBinding
                 Key="Down"
                 Command="{Binding OnDownKey}" />
@@ -65,7 +75,7 @@
             Grid.Column='0'
             CornerRadius="5"
             Background="#1e5878"
-            Visibility="{Binding IsEnabled, ElementName=searchInput, Converter={StaticResource InverseBool2Visibility}}">
+            Visibility="{Binding IsEnabled, Converter={StaticResource InverseBool2Visibility}}">
           <Grid>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="*" />
@@ -85,32 +95,35 @@
         <TextBlock
             Grid.Column='1'
             Text="🔎"
-            Visibility="{Binding IsEnabled, ElementName=searchInput, Converter={convert:BooleanToVisibilityConverter}}"
+            Visibility="{Binding IsEnabled, Converter={convert:BooleanToVisibilityConverter}}"
             Foreground="#cc9E9D9D" />
       </Grid>
     </Border>
 
     <Popup
-        x:Name="suggestionsPopup"
-        Visibility="{Binding IsOpen, ElementName=suggestionsPopup, Converter={convert:BooleanToVisibilityConverter}}"
-        Width="{Binding ActualWidth}"
+        Visibility="{Binding ShowPopup, Converter={convert:BooleanToVisibilityConverter}}"
+        IsOpen="{Binding ShowPopup}"
+        Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=UserControl}}"
         MinHeight="30"
         MaxHeight="150"
         StaysOpen="False"
         Placement="Bottom">
       <Grid>
         <ListBox
-            x:Name="suggestionsList"
-            Background="{x:Null}"
-            SelectionChanged="SelectionChanged" />
+            ItemsSource="{Binding Suggestions}"
+            SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            Visibility="{Binding Suggestions.Count, Converter={convert:LengthToVisibilityConverter}}"
+            SelectionChanged="SelectionChanged"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+            Background="{x:Null}" />
 
         <TextBlock
-            x:Name="noResults"
             TextWrapping="Wrap"
             Background="{x:Null}"
-            Text="{Binding NoResultsText}"
+            Text="{Binding NoResultsText, RelativeSource={RelativeSource AncestorType=UserControl}}"
             VerticalAlignment="Center"
             Padding="5 0"
+            Visibility="{Binding Suggestions.Count, Converter={StaticResource EmptyToVisible}}"
             Foreground="#ffbfbfbf" />
       </Grid>
     </Popup>
diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs b/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
index 0969a55..ef0db1a 100644
--- a/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
+++ b/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
@@ -1,13 +1,41 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
-using HunterPie.UI.Infrastructure;
+using MHWItemBoxTracker.ViewModels;
 
 namespace MHWItemBoxTracker.GUI {
   public partial class AutoSuggestBox : UserControl {
+    public AutoSuggestBoxViewModel VM { get; }
+    public AutoSuggestBox() {
+      InitializeComponent();
+      VM = new AutoSuggestBoxViewModel(
+        (suggestions, input) => OnTextChanged(suggestions, input),
+        (selection, selectedItem) => OnSuggestionChosen(selection, selectedItem)
+      );
+      Root.DataContext = VM;
+    }
+
+    // Couldn't get away from this :(
+    private void ClearSelection(object sender, RoutedEventArgs e) {
+      OnClearSelection(Selection);
+      searchInput.IsEnabled = true;
+      searchInput.Focus();
+    }
+    private void OnLoaded(object sender, RoutedEventArgs e) {
+      var empty = Activator.CreateInstance(Selection.GetType());
+      if (!empty.Equals(Selection)) {
+        searchInput.IsEnabled = false;
+      } else {
+        searchInput.Focus();
+      }
+    }
+
+    private void SelectionChanged(object sender, RoutedEventArgs e) {
+      var theList = sender as ListBox;
+      theList.ScrollIntoView(theList.SelectedItem);
+    }
+
     /// <summary>
     /// Event triggers when the text in the textbox changes (for every change)
     /// Also triggers when the user submits a search query by hitting Enter.
@@ -55,7 +83,7 @@ public partial class AutoSuggestBox : UserControl {
     /// </code>
     /// </example>
     /// </summary>
-    public event Action<object, object> OnSuggestionChosen = (o, l) => { };
+    public event Action<object, object> OnSuggestionChosen = (selection, selectedItem) => { };
 
     public static readonly DependencyProperty PlaceholderProperty = DependencyProperty.Register(
     "Placeholder", typeof(string), typeof(AutoSuggestBox), new PropertyMetadata("Search..."));
@@ -81,7 +109,10 @@ public string NoResultsText {
       set { SetValue(NoResultsProperty, value); }
     }
     public static readonly DependencyProperty SelectionProperty = DependencyProperty.Register(
-    "Selection", typeof(object), typeof(AutoSuggestBox), new PropertyMetadata(null));
+    "Selection", typeof(object), typeof(AutoSuggestBox), new PropertyMetadata(null, (d, e) => {
+      var control = d as AutoSuggestBox;
+      control.VM.Selection = e.NewValue;
+    }));
     /// <value>
     /// DependencyProperty <c>Selection</c>
     /// is the viewmodel that will hold the user's selection.
@@ -91,91 +122,5 @@ public object Selection {
       get { return (object)GetValue(SelectionProperty); }
       set { SetValue(SelectionProperty, value); }
     }
-
-    public AutoSuggestBox() {
-      OnEnter = new RelayCommand(i => onEnter(i as string));
-      OnDownKey = new ArglessRelayCommand(onDownKey);
-      OnUpKey = new ArglessRelayCommand(onUpKey);
-      OnEscape = new ArglessRelayCommand(onEscape);
-      InitializeComponent();
-      suggestionsList.ItemsSource = Suggestions;
-      Suggestions.CollectionChanged += SuggestionsChanged;
-    }
-    private ObservableCollection<object> Suggestions { get; } = new ObservableCollection<object>();
-    private bool itIsI = false;
-
-    private void TextChanged(object sender, TextChangedEventArgs e) {
-      if (string.IsNullOrEmpty(searchInput.Text)) {
-        suggestionsPopup.IsOpen = false;
-      } else {
-        suggestionsPopup.IsOpen = true;
-        OnTextChanged(Suggestions, searchInput.Text);
-      }
-    }
-
-    private void SelectionChanged(object sender, SelectionChangedEventArgs e) {
-      if (!itIsI && suggestionsList.SelectedIndex >= 0) {
-        DisplaySelection();
-      }
-      itIsI = false;
-    }
-    private void ClearSelection(object sender, RoutedEventArgs e) {
-      OnClearSelection(Selection);
-      searchInput.IsEnabled = true;
-      searchInput.Focus();
-    }
-
-    public ICommand OnEnter { get; }
-    public ICommand OnDownKey { get; }
-    public ICommand OnUpKey { get; }
-    public ICommand OnEscape { get; }
-    private void onEnter(string input) {
-      if (suggestionsList.SelectedIndex >= 0) {
-        DisplaySelection();
-      } else if (!string.IsNullOrEmpty(input)) {
-        OnTextChanged(Suggestions, input);
-        if (Suggestions.Count > 0) {
-          // triggers OnSelectionChanged, so no need to call DisplaySelection()
-          suggestionsList.SelectedIndex = 0;
-        }
-      }
-    }
-    private void onDownKey() {
-      var count = Suggestions.Count;
-      if (count > 0 && suggestionsList.SelectedIndex < (count - 1)) {
-        itIsI = true;
-        suggestionsList.SelectedIndex++;
-      }
-    }
-    private void onUpKey() {
-      if (Suggestions.Count > 0 && suggestionsList.SelectedIndex > -1) {
-        itIsI = true;
-        suggestionsList.SelectedIndex--;
-      }
-    }
-    private void onEscape() {
-      suggestionsPopup.IsOpen = false;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e) {
-      var empty = Activator.CreateInstance(Selection.GetType());
-      if (!empty.Equals(Selection)) {
-        searchInput.IsEnabled = false;
-      }
-    }
-
-    void SuggestionsChanged(object sender, NotifyCollectionChangedEventArgs e) {
-      var isEmpty = Suggestions.Count == 0;
-      suggestionsList.Visibility = isEmpty ? Visibility.Collapsed : Visibility.Visible;
-      noResults.Visibility = isEmpty ? Visibility.Visible : Visibility.Collapsed;
-    }
-    private void DisplaySelection() {
-      suggestionsPopup.IsOpen = false;
-      OnSuggestionChosen(Selection, suggestionsList.SelectedItem);
-      suggestionsList.SelectedIndex = -1;
-
-      searchInput.IsEnabled = false;
-      searchInput.Clear();
-    }
   }
 }
diff --git a/ItemBoxTracker/ItemBoxTracker.csproj b/ItemBoxTracker/ItemBoxTracker.csproj
index c687375..f01bf2c 100644
--- a/ItemBoxTracker/ItemBoxTracker.csproj
+++ b/ItemBoxTracker/ItemBoxTracker.csproj
@@ -72,6 +72,9 @@
     <PackageReference Include="Newtonsoft.Json.Schema">
       <Version>3.0.13</Version>
     </PackageReference>
+    <PackageReference
+        Include="Microsoft.Xaml.Behaviors.Wpf"
+        Version="1.1.31" />
   </ItemGroup>
 
   <!-- Build tools -->
@@ -141,8 +144,10 @@
     <Compile Include="Service\ConfigService.cs" />
 
     <Compile Include="Utils\Dispatcher.cs" />
+    <Compile Include="Utils\Focuser.cs" />
     <Compile Include="Utils\NotifyPropertyChanged.cs" />
 
+    <Compile Include="ViewModels\AutoSuggestBoxViewModel.cs" />
     <Compile Include="ViewModels\ItemBoxTrackerViewModel.cs" />
     <Compile Include="ViewModels\ItemViewModel.cs" />
     <Compile Include="ViewModels\TrackingTabViewModel.cs" />
diff --git a/ItemBoxTracker/Utils/Focuser.cs b/ItemBoxTracker/Utils/Focuser.cs
new file mode 100644
index 0000000..8143e63
--- /dev/null
+++ b/ItemBoxTracker/Utils/Focuser.cs
@@ -0,0 +1,21 @@
+using System.Windows;
+using HunterPie.Plugins;
+using Microsoft.Xaml.Behaviors;
+using static MHWItemBoxTracker.Main;
+
+namespace MHWItemBoxTracker.Utils {
+  public class Focuser : DependencyObject {
+    public static readonly DependencyProperty IsFocusedProperty = DependencyProperty.Register(
+      "IsFocused", typeof(bool), typeof(Focuser), new PropertyMetadata(false, (d, e) => {
+        Plugin.Log("setting focus");
+        var ctrl = (UIElement)d;
+        if ((bool)e.NewValue) {
+          ctrl.Focus();
+        }
+      }));
+    public static bool GetIsFocused(DependencyObject ctrl) => (bool)ctrl.GetValue(IsFocusedProperty);
+    public static void SetIsFocused(DependencyObject ctrl, bool value) {
+      ctrl.SetValue(IsFocusedProperty, value);
+    }
+  }
+}
diff --git a/ItemBoxTracker/Utils/NotifyPropertyChanged.cs b/ItemBoxTracker/Utils/NotifyPropertyChanged.cs
index e7f4019..5bedb8d 100644
--- a/ItemBoxTracker/Utils/NotifyPropertyChanged.cs
+++ b/ItemBoxTracker/Utils/NotifyPropertyChanged.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace MHWItemBoxTracker.Utils {
@@ -14,5 +15,7 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string prope
       OnPropertyChanged(propertyName);
       return true;
     }
+
+    protected string CallerId { get => new StackTrace().GetFrames()[2].GetMethod().Name; }
   }
 }
diff --git a/ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs b/ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs
new file mode 100644
index 0000000..fe36fc2
--- /dev/null
+++ b/ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Windows.Input;
+using HunterPie.UI.Infrastructure;
+using MHWItemBoxTracker.Utils;
+
+namespace MHWItemBoxTracker.ViewModels {
+  public class AutoSuggestBoxViewModel : NotifyPropertyChanged {
+    // From DependencyProperties
+    private object selection;
+    public object Selection {
+      get => selection;
+      set => SetField(ref selection, value);
+    }
+    public Action<ObservableCollection<object>, string> OnTextChanged;
+    public Action<object, object> OnSuggestionChosen;
+    public AutoSuggestBoxViewModel(Action<ObservableCollection<object>, string> OnTextChanged,
+                                   Action<object, object> OnSuggestionChosen) {
+      this.OnTextChanged = OnTextChanged;
+      this.OnSuggestionChosen = OnSuggestionChosen;
+
+      OnEnter = new ArglessRelayCommand(onEnter);
+      OnDownKey = new ArglessRelayCommand(onDownKey);
+      OnUpKey = new ArglessRelayCommand(onUpKey);
+      OnEscape = new ArglessRelayCommand(() => { ShowPopup = false; });
+    }
+
+    // IMO this is still tight coupling with the View
+    private ObservableCollection<object> suggestions = new();
+    private bool isEnabled = true;
+    private string searchQuery;
+    private int selectedIndex;
+    private bool showPopup;
+    public ObservableCollection<object> Suggestions {
+      get => suggestions;
+      set => SetField(ref suggestions, value);
+    }
+    public bool IsEnabled {
+      get => isEnabled;
+      set => SetField(ref isEnabled, value);
+    }
+    public string SearchQuery {
+      get => searchQuery;
+      set {
+        SetField(ref searchQuery, value);
+        TextChanged();
+      }
+    }
+    public int SelectedIndex {
+      get => selectedIndex;
+      set {
+        SetField(ref selectedIndex, value);
+        if (CallerId == "InvokeMethod") {
+          SelectionChanged();
+        }
+      }
+    }
+    public bool ShowPopup {
+      get => showPopup;
+      set => SetField(ref showPopup, value);
+    }
+
+    private void TextChanged() {
+      if (string.IsNullOrEmpty(SearchQuery)) {
+        ShowPopup = false;
+      } else {
+        ShowPopup = true;
+        OnTextChanged(Suggestions, SearchQuery);
+      }
+    }
+
+    public ICommand OnEnter { get; }
+    public ICommand OnDownKey { get; }
+    public ICommand OnUpKey { get; }
+    public ICommand OnEscape { get; }
+    private void onEnter() {
+      if (SelectedIndex >= 0) {
+        DisplaySelection();
+      } else if (!string.IsNullOrEmpty(SearchQuery)) {
+        OnTextChanged(Suggestions, SearchQuery);
+        if (Suggestions.Count > 0) {
+          // triggers SelectionChanged, so no need to call DisplaySelection()
+          SelectedIndex = 0;
+        }
+      }
+    }
+    private void onDownKey() {
+      var count = Suggestions.Count;
+      if (count > 0 && SelectedIndex < (count - 1)) {
+        ShowPopup = true;
+        SelectedIndex++;
+      }
+    }
+    private void onUpKey() {
+      if (Suggestions.Count > 0 && SelectedIndex > -1) {
+        SelectedIndex--;
+      }
+    }
+
+    private void SelectionChanged() {
+      if (SelectedIndex >= 0) {
+        DisplaySelection();
+      }
+    }
+
+    private void DisplaySelection() {
+      ShowPopup = false;
+      OnSuggestionChosen(Selection, Suggestions[SelectedIndex]);
+      SelectedIndex = -1;
+
+      IsEnabled = false;
+      SearchQuery = "";
+    }
+  }
+}

From 99917d2c7e350c980f4c8f10ed5468a3ca5d6790 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 14:18:01 -0400
Subject: [PATCH 04/14] refactor(ItemDataTemplate): add name to tooltip

---
 ItemBoxTracker/GUI/ItemDataTemplate.xaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ItemBoxTracker/GUI/ItemDataTemplate.xaml b/ItemBoxTracker/GUI/ItemDataTemplate.xaml
index d4a3502..8e0814f 100644
--- a/ItemBoxTracker/GUI/ItemDataTemplate.xaml
+++ b/ItemBoxTracker/GUI/ItemDataTemplate.xaml
@@ -10,10 +10,15 @@
           <TextBlock
               Foreground="#ffbfbfbf"
               Padding="5 0"
-              Text="{Binding ItemId, StringFormat=ItemId: 0x{0:x4}}" />
+              TextWrapping="Wrap"
+              Text="{Binding Name}" />
           <TextBlock
               Foreground="#ffbfbfbf"
               Padding="5 5"
+              Text="{Binding ItemId, StringFormat=ItemId: 0x{0:x4}}" />
+          <TextBlock
+              Foreground="#ffbfbfbf"
+              Padding="5 0"
               TextWrapping="Wrap"
               Text="{Binding ItemId, Converter={convert:ItemIdToDescription}}" />
         </StackPanel>

From 1832ebefe2c72dd974e784274a94b3a2f7e8f120 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 15:39:18 -0400
Subject: [PATCH 05/14] chore(build): move source files to reasonable
 directories and use pattern matching in .csproj

---
 ItemBoxTracker/ItemBoxTracker.csproj          | 77 ++-----------------
 ItemBoxTracker/Properties/AssemblyInfo.cs     |  6 +-
 ItemBoxTracker/Utils/Focuser.cs               | 21 -----
 .../Plugin}/Converter/CountToString.cs        |  0
 .../Plugin}/Converter/ItemIdToDescription.cs  |  0
 .../Plugin/GUI/ButtonStyle.xaml}              |  0
 .../Plugin}/GUI/ItemDataTemplate.xaml         |  0
 ItemBoxTracker/{ => src/Plugin}/Main.cs       |  0
 .../Model}/DeprecatedItemBoxTrackerConfig.cs  |  0
 .../Plugin/Model}/ItemBoxTrackerConfig.cs     |  0
 .../Plugin/Model}/ItemBoxWidgetSettings.cs    |  0
 .../Plugin/Model}/ItemConfig.cs               |  0
 .../Plugin/Model}/TrackingTabConfig.cs        |  0
 .../{ => src/Plugin}/Service/ConfigService.cs |  0
 .../Plugin/ViewModel}/ItemBoxTracker.cs       |  0
 .../ViewModel}/ItemBoxTrackerViewModel.cs     |  0
 .../Plugin/ViewModel}/ItemViewModel.cs        |  0
 .../Plugin/ViewModel}/TrackingTabViewModel.cs |  0
 .../Plugin/Views}/ItemBoxTracker.xaml         |  0
 .../Plugin/Views}/ItemBoxTracker.xaml.cs      |  0
 .../{GUI => src/Plugin/Views}/Settings.xaml   |  4 +-
 .../Plugin/Views}/Settings.xaml.cs            |  0
 .../Plugin/Views}/SettingsTab.xaml            |  0
 .../Plugin/Views}/SettingsTab.xaml.cs         |  0
 .../{ => src/Shareables}/Utils/Dispatcher.cs  |  0
 .../Utils/NotifyPropertyChanged.cs            |  0
 .../ViewModel}/AutoSuggestBoxViewModel.cs     |  0
 .../Shareables/Views}/AutoSuggestBox.xaml     |  0
 .../Shareables/Views}/AutoSuggestBox.xaml.cs  |  0
 .../Shareables/Views}/DragAndDropper.xaml     |  0
 .../Shareables/Views}/DragAndDropper.xaml.cs  |  0
 31 files changed, 12 insertions(+), 96 deletions(-)
 delete mode 100644 ItemBoxTracker/Utils/Focuser.cs
 rename ItemBoxTracker/{ => src/Plugin}/Converter/CountToString.cs (100%)
 rename ItemBoxTracker/{ => src/Plugin}/Converter/ItemIdToDescription.cs (100%)
 rename ItemBoxTracker/{GUI/ButtonOverride.xaml => src/Plugin/GUI/ButtonStyle.xaml} (100%)
 rename ItemBoxTracker/{ => src/Plugin}/GUI/ItemDataTemplate.xaml (100%)
 rename ItemBoxTracker/{ => src/Plugin}/Main.cs (100%)
 rename ItemBoxTracker/{Config => src/Plugin/Model}/DeprecatedItemBoxTrackerConfig.cs (100%)
 rename ItemBoxTracker/{Config => src/Plugin/Model}/ItemBoxTrackerConfig.cs (100%)
 rename ItemBoxTracker/{Config => src/Plugin/Model}/ItemBoxWidgetSettings.cs (100%)
 rename ItemBoxTracker/{Config => src/Plugin/Model}/ItemConfig.cs (100%)
 rename ItemBoxTracker/{Config => src/Plugin/Model}/TrackingTabConfig.cs (100%)
 rename ItemBoxTracker/{ => src/Plugin}/Service/ConfigService.cs (100%)
 rename ItemBoxTracker/{Controller => src/Plugin/ViewModel}/ItemBoxTracker.cs (100%)
 rename ItemBoxTracker/{ViewModels => src/Plugin/ViewModel}/ItemBoxTrackerViewModel.cs (100%)
 rename ItemBoxTracker/{ViewModels => src/Plugin/ViewModel}/ItemViewModel.cs (100%)
 rename ItemBoxTracker/{ViewModels => src/Plugin/ViewModel}/TrackingTabViewModel.cs (100%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/ItemBoxTracker.xaml (100%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/ItemBoxTracker.xaml.cs (100%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/Settings.xaml (91%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/Settings.xaml.cs (100%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/SettingsTab.xaml (100%)
 rename ItemBoxTracker/{GUI => src/Plugin/Views}/SettingsTab.xaml.cs (100%)
 rename ItemBoxTracker/{ => src/Shareables}/Utils/Dispatcher.cs (100%)
 rename ItemBoxTracker/{ => src/Shareables}/Utils/NotifyPropertyChanged.cs (100%)
 rename ItemBoxTracker/{ViewModels => src/Shareables/ViewModel}/AutoSuggestBoxViewModel.cs (100%)
 rename ItemBoxTracker/{GUI => src/Shareables/Views}/AutoSuggestBox.xaml (100%)
 rename ItemBoxTracker/{GUI => src/Shareables/Views}/AutoSuggestBox.xaml.cs (100%)
 rename ItemBoxTracker/{GUI => src/Shareables/Views}/DragAndDropper.xaml (100%)
 rename ItemBoxTracker/{GUI => src/Shareables/Views}/DragAndDropper.xaml.cs (100%)

diff --git a/ItemBoxTracker/ItemBoxTracker.csproj b/ItemBoxTracker/ItemBoxTracker.csproj
index f01bf2c..7c83421 100644
--- a/ItemBoxTracker/ItemBoxTracker.csproj
+++ b/ItemBoxTracker/ItemBoxTracker.csproj
@@ -126,80 +126,17 @@
     </None>
   </ItemGroup>
 
-  <!-- BS source file list -->
+  <!-- Actual source files -->
   <ItemGroup>
-    <Compile Include="Main.cs" />
+    <Compile
+        Include="src\**\*.cs"
+        Exclude="src\**\*.xaml.cs" />
 
-    <Compile Include="Config\DeprecatedItemBoxTrackerConfig.cs" />
-    <Compile Include="Config\ItemBoxTrackerConfig.cs" />
-    <Compile Include="Config\ItemBoxWidgetSettings.cs" />
-    <Compile Include="Config\ItemConfig.cs" />
-    <Compile Include="Config\TrackingTabConfig.cs" />
-
-    <Compile Include="Controller\ItemBoxTracker.cs" />
-
-    <Compile Include="Converter\CountToString.cs" />
-    <Compile Include="Converter\ItemIdToDescription.cs" />
-
-    <Compile Include="Service\ConfigService.cs" />
-
-    <Compile Include="Utils\Dispatcher.cs" />
-    <Compile Include="Utils\Focuser.cs" />
-    <Compile Include="Utils\NotifyPropertyChanged.cs" />
-
-    <Compile Include="ViewModels\AutoSuggestBoxViewModel.cs" />
-    <Compile Include="ViewModels\ItemBoxTrackerViewModel.cs" />
-    <Compile Include="ViewModels\ItemViewModel.cs" />
-    <Compile Include="ViewModels\TrackingTabViewModel.cs" />
-
-  </ItemGroup>
-
-  <!-- XAML Code-Behind -->
-  <ItemGroup>
-    <Compile Include="GUI\AutoSuggestBox.xaml.cs">
-      <DependentUpon>AutoSuggestBox.xaml</DependentUpon>
+    <Compile Include="src\**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
-    <Compile Include="GUI\DragAndDropper.xaml.cs">
-      <DependentUpon>DragAndDropper.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GUI\ItemBoxTracker.xaml.cs">
-      <DependentUpon>ItemBoxTracker.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GUI\Settings.xaml.cs">
-      <DependentUpon>Settings.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GUI\SettingsTab.xaml.cs">
-      <DependentUpon>SettingsTab.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 
-  <!-- XAML -->
-  <ItemGroup>
-    <Page Include="GUI\AutoSuggestBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\ButtonOverride.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\DragAndDropper.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\ItemDataTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\ItemBoxTracker.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="GUI\SettingsTab.xaml">
+    <Page Include="src\**\*.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ItemBoxTracker/Properties/AssemblyInfo.cs b/ItemBoxTracker/Properties/AssemblyInfo.cs
index d773bb7..057c837 100644
--- a/ItemBoxTracker/Properties/AssemblyInfo.cs
+++ b/ItemBoxTracker/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ItemBoxTracker/Utils/Focuser.cs b/ItemBoxTracker/Utils/Focuser.cs
deleted file mode 100644
index 8143e63..0000000
--- a/ItemBoxTracker/Utils/Focuser.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Windows;
-using HunterPie.Plugins;
-using Microsoft.Xaml.Behaviors;
-using static MHWItemBoxTracker.Main;
-
-namespace MHWItemBoxTracker.Utils {
-  public class Focuser : DependencyObject {
-    public static readonly DependencyProperty IsFocusedProperty = DependencyProperty.Register(
-      "IsFocused", typeof(bool), typeof(Focuser), new PropertyMetadata(false, (d, e) => {
-        Plugin.Log("setting focus");
-        var ctrl = (UIElement)d;
-        if ((bool)e.NewValue) {
-          ctrl.Focus();
-        }
-      }));
-    public static bool GetIsFocused(DependencyObject ctrl) => (bool)ctrl.GetValue(IsFocusedProperty);
-    public static void SetIsFocused(DependencyObject ctrl, bool value) {
-      ctrl.SetValue(IsFocusedProperty, value);
-    }
-  }
-}
diff --git a/ItemBoxTracker/Converter/CountToString.cs b/ItemBoxTracker/src/Plugin/Converter/CountToString.cs
similarity index 100%
rename from ItemBoxTracker/Converter/CountToString.cs
rename to ItemBoxTracker/src/Plugin/Converter/CountToString.cs
diff --git a/ItemBoxTracker/Converter/ItemIdToDescription.cs b/ItemBoxTracker/src/Plugin/Converter/ItemIdToDescription.cs
similarity index 100%
rename from ItemBoxTracker/Converter/ItemIdToDescription.cs
rename to ItemBoxTracker/src/Plugin/Converter/ItemIdToDescription.cs
diff --git a/ItemBoxTracker/GUI/ButtonOverride.xaml b/ItemBoxTracker/src/Plugin/GUI/ButtonStyle.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/ButtonOverride.xaml
rename to ItemBoxTracker/src/Plugin/GUI/ButtonStyle.xaml
diff --git a/ItemBoxTracker/GUI/ItemDataTemplate.xaml b/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/ItemDataTemplate.xaml
rename to ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
diff --git a/ItemBoxTracker/Main.cs b/ItemBoxTracker/src/Plugin/Main.cs
similarity index 100%
rename from ItemBoxTracker/Main.cs
rename to ItemBoxTracker/src/Plugin/Main.cs
diff --git a/ItemBoxTracker/Config/DeprecatedItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
similarity index 100%
rename from ItemBoxTracker/Config/DeprecatedItemBoxTrackerConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
diff --git a/ItemBoxTracker/Config/ItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
similarity index 100%
rename from ItemBoxTracker/Config/ItemBoxTrackerConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
diff --git a/ItemBoxTracker/Config/ItemBoxWidgetSettings.cs b/ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs
similarity index 100%
rename from ItemBoxTracker/Config/ItemBoxWidgetSettings.cs
rename to ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs
diff --git a/ItemBoxTracker/Config/ItemConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
similarity index 100%
rename from ItemBoxTracker/Config/ItemConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
diff --git a/ItemBoxTracker/Config/TrackingTabConfig.cs b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
similarity index 100%
rename from ItemBoxTracker/Config/TrackingTabConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
diff --git a/ItemBoxTracker/Service/ConfigService.cs b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
similarity index 100%
rename from ItemBoxTracker/Service/ConfigService.cs
rename to ItemBoxTracker/src/Plugin/Service/ConfigService.cs
diff --git a/ItemBoxTracker/Controller/ItemBoxTracker.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
similarity index 100%
rename from ItemBoxTracker/Controller/ItemBoxTracker.cs
rename to ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
diff --git a/ItemBoxTracker/ViewModels/ItemBoxTrackerViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
similarity index 100%
rename from ItemBoxTracker/ViewModels/ItemBoxTrackerViewModel.cs
rename to ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
diff --git a/ItemBoxTracker/ViewModels/ItemViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
similarity index 100%
rename from ItemBoxTracker/ViewModels/ItemViewModel.cs
rename to ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
diff --git a/ItemBoxTracker/ViewModels/TrackingTabViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
similarity index 100%
rename from ItemBoxTracker/ViewModels/TrackingTabViewModel.cs
rename to ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
diff --git a/ItemBoxTracker/GUI/ItemBoxTracker.xaml b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/ItemBoxTracker.xaml
rename to ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
diff --git a/ItemBoxTracker/GUI/ItemBoxTracker.xaml.cs b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
similarity index 100%
rename from ItemBoxTracker/GUI/ItemBoxTracker.xaml.cs
rename to ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
diff --git a/ItemBoxTracker/GUI/Settings.xaml b/ItemBoxTracker/src/Plugin/Views/Settings.xaml
similarity index 91%
rename from ItemBoxTracker/GUI/Settings.xaml
rename to ItemBoxTracker/src/Plugin/Views/Settings.xaml
index 5879208..416828a 100644
--- a/ItemBoxTracker/GUI/Settings.xaml
+++ b/ItemBoxTracker/src/Plugin/Views/Settings.xaml
@@ -14,8 +14,8 @@
   <UserControl.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ItemDataTemplate.xaml" />
-        <ResourceDictionary Source="ButtonOverride.xaml" />
+        <ResourceDictionary Source="../GUI/ItemDataTemplate.xaml" />
+        <ResourceDictionary Source="../GUI/ButtonStyle.xaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </UserControl.Resources>
diff --git a/ItemBoxTracker/GUI/Settings.xaml.cs b/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
similarity index 100%
rename from ItemBoxTracker/GUI/Settings.xaml.cs
rename to ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
diff --git a/ItemBoxTracker/GUI/SettingsTab.xaml b/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/SettingsTab.xaml
rename to ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml
diff --git a/ItemBoxTracker/GUI/SettingsTab.xaml.cs b/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs
similarity index 100%
rename from ItemBoxTracker/GUI/SettingsTab.xaml.cs
rename to ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs
diff --git a/ItemBoxTracker/Utils/Dispatcher.cs b/ItemBoxTracker/src/Shareables/Utils/Dispatcher.cs
similarity index 100%
rename from ItemBoxTracker/Utils/Dispatcher.cs
rename to ItemBoxTracker/src/Shareables/Utils/Dispatcher.cs
diff --git a/ItemBoxTracker/Utils/NotifyPropertyChanged.cs b/ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs
similarity index 100%
rename from ItemBoxTracker/Utils/NotifyPropertyChanged.cs
rename to ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs
diff --git a/ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs b/ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs
similarity index 100%
rename from ItemBoxTracker/ViewModels/AutoSuggestBoxViewModel.cs
rename to ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs
diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/AutoSuggestBox.xaml
rename to ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
diff --git a/ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs
similarity index 100%
rename from ItemBoxTracker/GUI/AutoSuggestBox.xaml.cs
rename to ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs
diff --git a/ItemBoxTracker/GUI/DragAndDropper.xaml b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml
similarity index 100%
rename from ItemBoxTracker/GUI/DragAndDropper.xaml
rename to ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml
diff --git a/ItemBoxTracker/GUI/DragAndDropper.xaml.cs b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs
similarity index 100%
rename from ItemBoxTracker/GUI/DragAndDropper.xaml.cs
rename to ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs

From 59444e736b174bb18a558ab6dea6b81976cf7237 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 19:15:09 -0400
Subject: [PATCH 06/14] refactor(Model): rename namespace
 MHWItemBoxTracker.Config to MHWItemBoxTracker.Model

---
 .../src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs          | 2 +-
 ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs         | 2 +-
 ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs        | 2 +-
 ItemBoxTracker/src/Plugin/Model/ItemConfig.cs                   | 2 +-
 ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs            | 2 +-
 ItemBoxTracker/src/Plugin/Service/ConfigService.cs              | 2 +-
 ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs           | 2 +-
 ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs  | 2 +-
 ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs            | 2 +-
 ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs     | 2 +-
 ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs          | 2 +-
 ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs                | 2 +-
 scripts/gen-settings-json.csx                                   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
index 0f0d5df..8f4634d 100644
--- a/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace MHWItemBoxTracker.Config {
+namespace MHWItemBoxTracker.Model {
   public class DeprecatedItemBoxTrackerConfig {
     [DisplayName("Items to Track")]
     [Description("You can find item IDs here: https://github.com/Ezekial711/MonsterHunterWorldModding/wiki/Item-IDs")]
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
index e04bcc2..afcea2e 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace MHWItemBoxTracker.Config {
+namespace MHWItemBoxTracker.Model {
   public class ItemBoxTrackerConfig {
     [DisplayName("Track Always")]
     [Description("Items to track everywhere")]
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs b/ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs
index 6a0ef9b..c6d60f7 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemBoxWidgetSettings.cs
@@ -1,4 +1,4 @@
-namespace MHWItemBoxTracker.Config {
+namespace MHWItemBoxTracker.Model {
   public class ItemBoxWidgetSettings : HunterPie.Core.Settings.IWidgetSettings {
     public bool Initialize { get; set; } = true;
     public bool Enabled { get; set; } = true;
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
index 28e8699..e2050e1 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MHWItemBoxTracker.Config {
+namespace MHWItemBoxTracker.Model {
   public class ItemConfig {
     public string Name { get; set; }
     [Required]
diff --git a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
index 50e9d2b..428b3b5 100644
--- a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace MHWItemBoxTracker.Config {
+namespace MHWItemBoxTracker.Model {
   public class TrackingTabConfig {
     [DisplayName("Track items in pouch")]
     [Description("Enable to count items in your pouch on the progress bars")]
diff --git a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
index a80c013..3932f59 100644
--- a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
+++ b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using HunterPie.Plugins;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using static MHWItemBoxTracker.Main;
 
 namespace MHWItemBoxTracker.Service {
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
index 0ce78ec..549f776 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using HunterPie.Core;
 using HunterPie.GUI;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Service;
 using static MHWItemBoxTracker.Utils.Dispatcher;
 
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
index 1ab503d..4804b3d 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.ViewModels {
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
index 6185e70..c03d9db 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
@@ -1,4 +1,4 @@
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.ViewModels {
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
index 0a7c45c..a933085 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Linq;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.ViewModels {
diff --git a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
index 2fa1acb..b672095 100644
--- a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
@@ -2,7 +2,7 @@
 using HunterPie.Core.Settings;
 using HunterPie.GUI;
 using HunterPie.Plugins;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using static MHWItemBoxTracker.Main;
 using static MHWItemBoxTracker.Utils.Dispatcher;
 
diff --git a/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs b/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
index 223d171..6487d95 100644
--- a/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
@@ -4,7 +4,7 @@
 using System.Windows.Controls;
 using HunterPie.Core.Native;
 using HunterPie.Settings;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Service;
 using MHWItemBoxTracker.ViewModels;
 
diff --git a/scripts/gen-settings-json.csx b/scripts/gen-settings-json.csx
index f0c9828..aba0d66 100644
--- a/scripts/gen-settings-json.csx
+++ b/scripts/gen-settings-json.csx
@@ -1,7 +1,7 @@
 #r "ItemBoxTracker.dll"
 
 using System.IO;
-using MHWItemBoxTracker.Config;
+using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Service;
 using Newtonsoft.Json;
 

From a99b48477b0dc4289b3f98c0bb00e7d773deac0d Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 19:39:53 -0400
Subject: [PATCH 07/14] refactor(Model): make models implement
 INotifyPropertyChanged

---
 .../src/Plugin/Model/ItemBoxTrackerConfig.cs  | 22 ++++++++++---
 ItemBoxTracker/src/Plugin/Model/ItemConfig.cs | 24 +++++++++++---
 .../src/Plugin/Model/TrackingTabConfig.cs     | 31 ++++++++++++++-----
 .../src/Plugin/Service/ConfigService.cs       |  3 +-
 .../Plugin/ViewModel/TrackingTabViewModel.cs  |  7 +++--
 5 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
index afcea2e..96ff399 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
@@ -1,17 +1,31 @@
 using System.ComponentModel;
+using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class ItemBoxTrackerConfig {
+  public class ItemBoxTrackerConfig : NotifyPropertyChanged {
+    private TrackingTabConfig always = new();
+    private TrackingTabConfig village = new();
+    private TrackingTabConfig quest = new();
+
     [DisplayName("Track Always")]
     [Description("Items to track everywhere")]
-    public TrackingTabConfig Always { get; set; } = new TrackingTabConfig();
+    public TrackingTabConfig Always {
+      get => always;
+      set => SetField(ref always, value);
+    }
 
     [DisplayName("Track in Village")]
     [Description("Items to track only in the village/gathering hub")]
-    public TrackingTabConfig Village { get; set; } = new TrackingTabConfig();
+    public TrackingTabConfig Village {
+      get => village;
+      set => SetField(ref village, value);
+    }
 
     [DisplayName("Track in Quest")]
     [Description("Items to track during a quest/expedition/guiding lands")]
-    public TrackingTabConfig Quest { get; set; } = new TrackingTabConfig();
+    public TrackingTabConfig Quest {
+      get => quest;
+      set => SetField(ref quest, value);
+    }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
index e2050e1..ad4a686 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
@@ -1,11 +1,27 @@
 using System.ComponentModel.DataAnnotations;
+using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class ItemConfig {
-    public string Name { get; set; }
+  public class ItemConfig : NotifyPropertyChanged {
+    private string name;
+    public int itemId;
+    public int amount;
+
+    public string Name {
+      get => name;
+      set => SetField(ref name, value);
+    }
+
     [Required]
-    public int ItemId { get; set; }
+    public int ItemId {
+      get => itemId;
+      set => SetField(ref itemId, value);
+    }
+
     [Required]
-    public int Amount { get; set; }
+    public int Amount {
+      get => amount;
+      set => SetField(ref amount, value);
+    }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
index 428b3b5..a436296 100644
--- a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
@@ -1,22 +1,39 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
+using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class TrackingTabConfig {
+  public class TrackingTabConfig : NotifyPropertyChanged {
+    private bool trackPouch = false;
+    private bool trackBox = true;
+    private bool trackCraftable = false;
+    private ObservableCollection<ItemConfig> tracking = new();
+
     [DisplayName("Track items in pouch")]
     [Description("Enable to count items in your pouch on the progress bars")]
-    public bool TrackPouch { get; set; } = false;
+    public bool TrackPouch {
+      get => trackPouch;
+      set => SetField(ref trackPouch, value);
+    }
 
     [DisplayName("Track items in box")]
     [Description("Enable to count items in your box on the progress bars")]
-    public bool TrackBox { get; set; } = true;
+    public bool TrackBox {
+      get => trackBox;
+      set => SetField(ref trackBox, value);
+    }
 
     [DisplayName("Track craftable items")]
     [Description("Enable to count items that can be crafted on the progress bars")]
-    public bool TrackCraftable { get; set; } = false;
+    public bool TrackCraftable {
+      get => trackCraftable;
+      set => SetField(ref trackCraftable, value);
+    }
 
     [DisplayName("Items to Track")]
-    [Description("You can find item IDs here: https://github.com/Ezekial711/MonsterHunterWorldModding/wiki/Item-IDs")]
-    public List<ItemConfig> Tracking { get; set; } = new List<ItemConfig>();
+    public ObservableCollection<ItemConfig> Tracking {
+      get => tracking;
+      set => SetField(ref tracking, value);
+    }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
index 3932f59..99de9b6 100644
--- a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
+++ b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
@@ -1,4 +1,5 @@
 
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -20,7 +21,7 @@ public async Task<ItemBoxTrackerConfig> LoadAsync() {
           // Not writing a comparer just for this...
           var oldConfig = await Plugin.LoadJson<DeprecatedItemBoxTrackerConfig>(settings);
           if (oldConfig.Tracking.Count > 0) {
-            config.Always.Tracking = oldConfig.Tracking.ToList();
+            config.Always.Tracking = new ObservableCollection<ItemConfig>(oldConfig.Tracking);
             await Plugin.SaveJson(settings, config);
             Plugin.Log("Converted settings file to the new format");
           }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
index a933085..46d24aa 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
@@ -56,9 +56,10 @@ public TrackingTabConfig ToConfig() {
         TrackPouch = trackPouch,
         TrackBox = trackBox,
         TrackCraftable = trackCraftable,
-        Tracking = tracking.Select(i => i.ToConfig())
-                           .Where(i => i.ItemId > 0)
-                           .ToList()
+        Tracking = new ObservableCollection<ItemConfig>(
+          tracking.Select(i => i.ToConfig())
+                  .Where(i => i.ItemId > 0)
+        )
       };
     }
   }

From 65235a8619d813b1e6d72399e214c631f9d12007 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Tue, 11 May 2021 20:59:23 -0400
Subject: [PATCH 08/14] refactor(SettingsView): use MVVM on settings screen
 Note: Also refactored AutoSuggestBox more and touched many files Added
 SearchableViewModel and sub class ItemViewModel Added ItemToViewModel
 Converter to allow xaml to transform ItemConfig to ItemViewModel

---
 .../src/Plugin/Converter/ItemToViewModel.cs   |  30 +++++
 .../src/Plugin/GUI/ItemDataTemplate.xaml      |   4 +-
 ItemBoxTracker/src/Plugin/Main.cs             |   3 +-
 ItemBoxTracker/src/Plugin/Model/ItemConfig.cs |  12 ++
 .../src/Plugin/Service/ConfigService.cs       |   8 +-
 .../src/Plugin/ViewModel/ItemBoxTracker.cs    |  10 +-
 .../ViewModel/ItemBoxTrackerViewModel.cs      |  52 --------
 .../src/Plugin/ViewModel/ItemViewModel.cs     |  68 ++++------
 .../src/Plugin/ViewModel/SettingsViewModel.cs |  74 +++++++++++
 .../Plugin/ViewModel/TrackingTabViewModel.cs  |  85 ++++++-------
 .../src/Plugin/Views/ItemBoxTracker.xaml      |  86 ++++++++-----
 .../src/Plugin/Views/ItemBoxTracker.xaml.cs   |   6 +-
 .../src/Plugin/Views/Settings.xaml.cs         |  60 ---------
 .../src/Plugin/Views/SettingsTab.xaml         | 111 -----------------
 .../src/Plugin/Views/SettingsTab.xaml.cs      |  67 ----------
 .../{Settings.xaml => SettingsView.xaml}      |  19 ++-
 .../src/Plugin/Views/SettingsView.xaml.cs     |  33 +++++
 .../src/Plugin/Views/TrackingTabView.xaml     | 117 ++++++++++++++++++
 .../src/Plugin/Views/TrackingTabView.xaml.cs  |   9 ++
 .../Shareables/Utils/NotifyPropertyChanged.cs |   2 +-
 .../ViewModel/AutoSuggestBoxViewModel.cs      | 115 -----------------
 .../ViewModel/SearchableViewModel.cs          | 105 ++++++++++++++++
 .../src/Shareables/Views/AutoSuggestBox.xaml  |  41 +++---
 .../Shareables/Views/AutoSuggestBox.xaml.cs   |  94 ++------------
 .../src/Shareables/Views/DragAndDropper.xaml  |   2 +-
 .../Shareables/Views/DragAndDropper.xaml.cs   |   2 +-
 26 files changed, 564 insertions(+), 651 deletions(-)
 create mode 100644 ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
 delete mode 100644 ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
 create mode 100644 ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
 delete mode 100644 ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
 delete mode 100644 ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml
 delete mode 100644 ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs
 rename ItemBoxTracker/src/Plugin/Views/{Settings.xaml => SettingsView.xaml} (69%)
 create mode 100644 ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
 create mode 100644 ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml
 create mode 100644 ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
 delete mode 100644 ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs
 create mode 100644 ItemBoxTracker/src/Shareables/ViewModel/SearchableViewModel.cs

diff --git a/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
new file mode 100644
index 0000000..fb76c81
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Markup;
+using MHWItemBoxTracker.Model;
+using MHWItemBoxTracker.ViewModel;
+
+namespace MHWItemBoxTracker.Converter {
+  public class ItemToViewModel : MarkupExtension, IMultiValueConverter {
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+      var item = values[0] as ItemConfig;
+      var suggestions = values[1] as ObservableCollection<ItemConfig>;
+      var currentlySelected = values[2] as ObservableCollection<ItemConfig>;
+
+      return new ItemViewModel(item) {
+        SuggestionsView = CollectionViewSource.GetDefaultView(suggestions),
+        CurrentlySelected = currentlySelected
+      };
+    }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) {
+      throw new NotImplementedException();
+    }
+
+    public override object ProvideValue(IServiceProvider serviceProvider) {
+      return this;
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml b/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
index 8e0814f..76a6244 100644
--- a/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
+++ b/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:data="clr-namespace:MHWItemBoxTracker.ViewModels"
+    xmlns:data="clr-namespace:MHWItemBoxTracker.Model"
     xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter">
-  <DataTemplate DataType="{x:Type data:ItemViewModel}">
+  <DataTemplate DataType="{x:Type data:ItemConfig}">
     <StackPanel Orientation="Horizontal">
       <StackPanel.ToolTip>
         <StackPanel>
diff --git a/ItemBoxTracker/src/Plugin/Main.cs b/ItemBoxTracker/src/Plugin/Main.cs
index 4158e41..3b6c41e 100644
--- a/ItemBoxTracker/src/Plugin/Main.cs
+++ b/ItemBoxTracker/src/Plugin/Main.cs
@@ -3,6 +3,7 @@
 using HunterPie.Plugins;
 using HunterPie.Settings;
 using MHWItemBoxTracker.Service;
+using MHWItemBoxTracker.Views;
 
 namespace MHWItemBoxTracker {
   public class Main : IPlugin, ISettingsOwner {
@@ -45,7 +46,7 @@ public void Unload() {
     }
 
     public IEnumerable<ISettingsTab> GetSettings(ISettingsBuilder builder) {
-      builder.AddTab(new GUI.Settings(Config));
+      builder.AddTab(new SettingsView(Config));
       return builder.Value();
     }
   }
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
index ad4a686..299a9b8 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
@@ -23,5 +23,17 @@ public int Amount {
       get => amount;
       set => SetField(ref amount, value);
     }
+
+    public override bool Equals(object obj) {
+      if ((obj != null) && GetType().Equals(obj.GetType())) {
+        var Obj = (ItemConfig)obj;
+        return Obj.ItemId == ItemId;
+      }
+      return false;
+    }
+
+    public override int GetHashCode() {
+      return ItemId;
+    }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
index 99de9b6..16ae625 100644
--- a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
+++ b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
@@ -34,10 +34,14 @@ public async Task<ItemBoxTrackerConfig> LoadAsync() {
       }
     }
 
-    public async Task SaveAsync(ItemBoxTrackerConfig config) {
+    public async Task SaveAsync() {
       await locke.WaitAsync();
       try {
-        Config = config;
+        // TODO: Do this clean up better
+        Config.Always.Tracking = new(Config.Always.Tracking.Where(i => i.ItemId > 0));
+        Config.Village.Tracking = new(Config.Village.Tracking.Where(i => i.ItemId > 0));
+        Config.Quest.Tracking = new(Config.Quest.Tracking.Where(i => i.ItemId > 0));
+
         await Plugin.SaveJson(settings, Config);
       } finally {
         locke.Release();
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
index 549f776..d43d160 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
@@ -10,7 +10,7 @@
 namespace MHWItemBoxTracker.Controller {
   class ItemBoxTracker {
     private Player player { get; }
-    private GUI.ItemBoxTracker gui;
+    private Views.ItemBoxTrackerView gui;
 
     private ConfigService Config;
 
@@ -18,7 +18,7 @@ public ItemBoxTracker(Player player, ConfigService Config) {
       this.player = player;
       this.Config = Config;
       Dispatch(() => {
-        gui = new GUI.ItemBoxTracker();
+        gui = new();
         Overlay.RegisterWidget(gui);
       });
     }
@@ -33,11 +33,11 @@ public void loadItemBox(object source = null, EventArgs e = null) {
         var ids = items.Select(ic => ic.ItemId).ToHashSet();
 
         var itemsHeld = box.FindItemsInBox(ids);
-        var itemBoxRows = new List<GUI.ItemBoxRow>();
+        var itemBoxRows = new List<Views.ItemBoxRow>();
         foreach (ItemConfig item in items) {
           itemsHeld.TryGetValue(item.ItemId, out int amountHeld);
 
-          itemBoxRows.Add(new GUI.ItemBoxRow {
+          itemBoxRows.Add(new Views.ItemBoxRow {
             name = item.Name,
             ratio = $"{amountHeld}/{item.Amount}",
             progress = 100.0 * amountHeld / item.Amount,
@@ -48,7 +48,7 @@ public void loadItemBox(object source = null, EventArgs e = null) {
     }
 
     public void unloadItemBox(object source = null, EventArgs e = null) {
-      Dispatch(() => gui.setItemsToDisplay(new List<GUI.ItemBoxRow>()));
+      Dispatch(() => gui.setItemsToDisplay(new List<Views.ItemBoxRow>()));
     }
 
     public void unregister() {
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
deleted file mode 100644
index 4804b3d..0000000
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTrackerViewModel.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Collections.ObjectModel;
-using MHWItemBoxTracker.Model;
-using MHWItemBoxTracker.Utils;
-
-namespace MHWItemBoxTracker.ViewModels {
-  public class ItemBoxTrackerViewModel : NotifyPropertyChanged {
-    private TrackingTabViewModel always;
-    private TrackingTabViewModel village;
-    private TrackingTabViewModel quest;
-    private ObservableCollection<ItemViewModel> items = new();
-
-    public ItemBoxTrackerViewModel(ItemBoxTrackerConfig config) {
-      always = new TrackingTabViewModel(config.Always) {
-        Items = Items
-      };
-      village = new TrackingTabViewModel(config.Village) {
-        Items = Items
-      };
-      quest = new TrackingTabViewModel(config.Quest) {
-        Items = Items
-      };
-    }
-
-    public TrackingTabViewModel Always {
-      get => always;
-      set => SetField(ref always, value);
-    }
-
-    public TrackingTabViewModel Village {
-      get => village;
-      set => SetField(ref village, value);
-    }
-
-    public TrackingTabViewModel Quest {
-      get => quest;
-      set => SetField(ref quest, value);
-    }
-
-    public ObservableCollection<ItemViewModel> Items {
-      get => items;
-      set => SetField(ref items, value);
-    }
-
-    public ItemBoxTrackerConfig ToConfig() {
-      return new ItemBoxTrackerConfig {
-        Always = always.ToConfig(),
-        Village = village.ToConfig(),
-        Quest = quest.ToConfig()
-      };
-    }
-  }
-}
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
index c03d9db..59ebb6b 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
@@ -1,53 +1,35 @@
-using MHWItemBoxTracker.Model;
-using MHWItemBoxTracker.Utils;
 
-namespace MHWItemBoxTracker.ViewModels {
-  public class ItemViewModel : NotifyPropertyChanged {
-    private string name;
-    private int itemId;
-    private int amount;
-
-    public ItemViewModel() { }
-
-    public ItemViewModel(ItemConfig config) {
-      name = config.Name;
-      itemId = config.ItemId;
-      amount = config.Amount;
-    }
-
-    public string Name {
-      get => name;
-      set => SetField(ref name, value);
-    }
-
-    public int ItemId {
-      get => itemId;
-      set => SetField(ref itemId, value);
-    }
-
-    public int Amount {
-      get => amount;
-      set => SetField(ref amount, value);
+using System.Collections.ObjectModel;
+using System.Globalization;
+using MHWItemBoxTracker.Model;
+
+namespace MHWItemBoxTracker.ViewModel {
+  public class ItemViewModel : SearchableViewModel {
+    private ObservableCollection<ItemConfig> currentlySelected;
+    public ObservableCollection<ItemConfig> CurrentlySelected {
+      get => currentlySelected;
+      set {
+        SetField(ref currentlySelected, value);
+      }
     }
+    public ItemViewModel(ItemConfig Data) : base(Data) { }
 
-    public override bool Equals(object obj) {
-      if ((obj != null) && GetType().Equals(obj.GetType())) {
-        var Obj = (ItemViewModel)obj;
-        return Obj.ItemId == ItemId;
-      }
-      return false;
+    public override void SuggestionChosen() {
+      var data = Data as ItemConfig;
+      var selectedItem = SuggestionsView.CurrentItem as ItemConfig;
+      data.ItemId = selectedItem.ItemId;
+      data.Name = selectedItem.Name;
     }
 
-    public override int GetHashCode() {
-      return ItemId;
+    public override bool SuggestionsFilter(object Candidate) {
+      var candidate = Candidate as ItemConfig;
+      return CultureInfo.CurrentCulture.CompareInfo.IndexOf(candidate.Name, SearchQuery, CompareOptions.IgnoreCase) >= 0
+          && !CurrentlySelected.Contains(candidate);
     }
 
-    public ItemConfig ToConfig() {
-      return new ItemConfig {
-        Name = name,
-        ItemId = itemId,
-        Amount = amount
-      };
+    public override void ClearSelection() {
+      var data = Data as ItemConfig;
+      data.ItemId = 0;
     }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
new file mode 100644
index 0000000..d276831
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
@@ -0,0 +1,74 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows.Input;
+using HunterPie.Core.Native;
+using HunterPie.Plugins;
+using HunterPie.UI.Infrastructure;
+using MHWItemBoxTracker.Model;
+using MHWItemBoxTracker.Utils;
+using static MHWItemBoxTracker.Main;
+
+namespace MHWItemBoxTracker.ViewModel {
+  public class SettingsViewModel : NotifyPropertyChanged {
+    private TrackingTabViewModel always;
+    private TrackingTabViewModel village;
+    private TrackingTabViewModel quest;
+    private ObservableCollection<ItemConfig> items = new();
+
+    public SettingsViewModel(ItemBoxTrackerConfig Config) {
+      this.Config = Config;
+      LoadItems = new ArglessRelayCommand(LoadItemsFromGMD);
+
+      always = new TrackingTabViewModel(Config.Always) {
+        Items = Items
+      };
+      village = new TrackingTabViewModel(Config.Village) {
+        Items = Items
+      };
+      quest = new TrackingTabViewModel(Config.Quest) {
+        Items = Items
+      };
+    }
+    public ItemBoxTrackerConfig Config { get; }
+    public ICommand LoadItems { get; }
+
+    private void LoadItemsFromGMD() {
+      if (GMD.Items.gValuesOffsets != null) {
+        var items = new ObservableCollection<ItemConfig>(Enumerable
+          .Range(0, GMD.Items.gValuesOffsets.Length / 2)
+          .Select(id => new ItemConfig {
+            ItemId = id,
+            Name = GMD.GetItemNameById(id)
+          })
+          .Where(item => item.Name != null)
+          .ToList());
+
+        // TODO: Try setting it instead
+        Items.Clear();
+        foreach (var item in items) {
+          Items.Add(item);
+        }
+      }
+    }
+
+    public TrackingTabViewModel Always {
+      get => always;
+      set => SetField(ref always, value);
+    }
+
+    public TrackingTabViewModel Village {
+      get => village;
+      set => SetField(ref village, value);
+    }
+
+    public TrackingTabViewModel Quest {
+      get => quest;
+      set => SetField(ref quest, value);
+    }
+
+    public ObservableCollection<ItemConfig> Items {
+      get => items;
+      set => SetField(ref items, value);
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
index 46d24aa..c9fa174 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
@@ -1,66 +1,53 @@
 using System.Collections.ObjectModel;
-using System.Linq;
+using System.Windows.Input;
+using HunterPie.UI.Infrastructure;
 using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Utils;
 
-namespace MHWItemBoxTracker.ViewModels {
+namespace MHWItemBoxTracker.ViewModel {
   public class TrackingTabViewModel : NotifyPropertyChanged {
-    private bool trackPouch;
-    private bool trackBox;
-    private bool trackCraftable;
-    private ObservableCollection<ItemViewModel> tracking;
-    private ObservableCollection<ItemViewModel> items;
-
-    public TrackingTabViewModel(TrackingTabConfig config) {
-      trackPouch = config.TrackPouch;
-      trackBox = config.TrackBox;
-      trackCraftable = config.TrackCraftable;
-      tracking = new ObservableCollection<ItemViewModel>(
-        config.Tracking
-              .Select(i => new ItemViewModel(i))
-              .ToList()
-        );
-
-      if (tracking.Count == 0) {
-        tracking.Add(new ItemViewModel());
+    public TrackingTabConfig Model { get; }
+    public ICommand AddRow { get; }
+    public ICommand DeleteRow { get; }
+    public ICommand MoveUp { get; }
+    public ICommand MoveDown { get; }
+    private ObservableCollection<ItemConfig> items;
+
+    public TrackingTabViewModel(TrackingTabConfig Model) {
+      this.Model = Model;
+      if (Model.Tracking.Count == 0) {
+        Model.Tracking.Add(new());
       }
-    }
 
-    public bool TrackPouch {
-      get => trackPouch;
-      set => SetField(ref trackPouch, value);
+      AddRow = new ArglessRelayCommand(() => Model.Tracking.Add(new()));
+      DeleteRow = new RelayCommand(item => deleteRow(item as ItemConfig));
+      MoveUp = new RelayCommand(item => moveUp(item as ItemConfig));
+      MoveDown = new RelayCommand(item => moveDown(item as ItemConfig));
     }
 
-    public bool TrackBox {
-      get => trackBox;
-      set => SetField(ref trackBox, value);
-    }
-
-    public bool TrackCraftable {
-      get => trackCraftable;
-      set => SetField(ref trackCraftable, value);
+    public ObservableCollection<ItemConfig> Items {
+      get => items;
+      set => SetField(ref items, value);
     }
 
-    public ObservableCollection<ItemViewModel> Tracking {
-      get => tracking;
-      set => SetField(ref tracking, value);
+    private void deleteRow(ItemConfig item) {
+      Model.Tracking.Remove(item);
+      if (Model.Tracking.Count == 0) {
+        Model.Tracking.Add(new());
+      }
     }
-
-    public ObservableCollection<ItemViewModel> Items {
-      get => items;
-      set => SetField(ref items, value);
+    private void moveUp(ItemConfig item) {
+      var index = Model.Tracking.IndexOf(item);
+      if (index > 0) {
+        Model.Tracking.Move(index, index - 1);
+      }
     }
 
-    public TrackingTabConfig ToConfig() {
-      return new TrackingTabConfig {
-        TrackPouch = trackPouch,
-        TrackBox = trackBox,
-        TrackCraftable = trackCraftable,
-        Tracking = new ObservableCollection<ItemConfig>(
-          tracking.Select(i => i.ToConfig())
-                  .Where(i => i.ItemId > 0)
-        )
-      };
+    private void moveDown(ItemConfig item) {
+      var index = Model.Tracking.IndexOf(item);
+      if (index < Model.Tracking.Count - 1) {
+        Model.Tracking.Move(index, index + 1);
+      }
     }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
index cd99a32..5c89cec 100644
--- a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
+++ b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
@@ -1,33 +1,57 @@
-<src:Widget x:Class="MHWItemBoxTracker.GUI.ItemBoxTracker"
-            xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
-            xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-            xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-            mc:Ignorable="d" 
-            ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True"
-            SizeToContent="Height" Width="350" WidgetActive="True">
-    <Grid>
-        <ListBox Name="theList" HorizontalContentAlignment="Stretch" IsEnabled="False">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid Margin="0,2">
-                        <!--<Image />-->
-                        <TextBlock Grid.Column="0" Text="{Binding name}" FontSize="14" HorizontalAlignment="Left" Padding="0,0,10,0" />
-                        <TextBlock Grid.Column="1" Text="{Binding ratio}" FontSize="14" HorizontalAlignment="Right" Padding="0,0,10,0" />
-                        <ProgressBar Grid.Column="2" Minimum="0" Maximum="100" Value="{Binding progress}" />
-                        <!--<Custom:MinimalHealthBar Style="{StaticResource OVERLAY_MONSTER_PART_BAR_STYLE}" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Top" />-->
+<src:Widget
+    x:Class="MHWItemBoxTracker.Views.ItemBoxTrackerView"
+    xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
+    xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    mc:Ignorable="d"
+    ResizeMode="NoResize"
+    WindowStyle="None"
+    AllowsTransparency="True"
+    ShowInTaskbar="False"
+    Topmost="True"
+    SizeToContent="Height"
+    Width="350"
+    WidgetActive="True">
+  <Grid>
+    <ListBox
+        Name="theList"
+        HorizontalContentAlignment="Stretch"
+        IsEnabled="False">
+      <ListBox.ItemTemplate>
+        <DataTemplate>
+          <Grid Margin="0,2">
+            <!--<Image />-->
+            <TextBlock
+                Grid.Column="0"
+                Text="{Binding name}"
+                FontSize="14"
+                HorizontalAlignment="Left"
+                Padding="0,0,10,0" />
+            <TextBlock
+                Grid.Column="1"
+                Text="{Binding ratio}"
+                FontSize="14"
+                HorizontalAlignment="Right"
+                Padding="0,0,10,0" />
+            <ProgressBar
+                Grid.Column="2"
+                Minimum="0"
+                Maximum="100"
+                Value="{Binding progress}" />
+            <!--<Custom:MinimalHealthBar Style="{StaticResource OVERLAY_MONSTER_PART_BAR_STYLE}" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Top" />-->
 
-                        <Grid.ColumnDefinitions>
-                            <!--<ColumnDefinition Width="50" />-->
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="75" />
-                            <ColumnDefinition Width="100" />
-                        </Grid.ColumnDefinitions>
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-    </Grid>
+            <Grid.ColumnDefinitions>
+              <!--<ColumnDefinition Width="50" />-->
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="75" />
+              <ColumnDefinition Width="100" />
+            </Grid.ColumnDefinitions>
+          </Grid>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
+  </Grid>
 </src:Widget>
diff --git a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
index b672095..6e8737f 100644
--- a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
@@ -6,12 +6,12 @@
 using static MHWItemBoxTracker.Main;
 using static MHWItemBoxTracker.Utils.Dispatcher;
 
-namespace MHWItemBoxTracker.GUI {
-  public partial class ItemBoxTracker : Widget {
+namespace MHWItemBoxTracker.Views {
+  public partial class ItemBoxTrackerView : Widget {
     private static readonly string settingsJson = "widget.settings.json";
     private ItemBoxWidgetSettings widgetSettings { get; set; }
     public override IWidgetSettings Settings => widgetSettings;
-    public ItemBoxTracker() : base() {
+    public ItemBoxTrackerView() : base() {
       InitializeComponent();
       Dispatch(async () => {
         widgetSettings = await Plugin.LoadJson<ItemBoxWidgetSettings>(settingsJson);
diff --git a/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs b/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
deleted file mode 100644
index 6487d95..0000000
--- a/ItemBoxTracker/src/Plugin/Views/Settings.xaml.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using HunterPie.Core.Native;
-using HunterPie.Settings;
-using MHWItemBoxTracker.Model;
-using MHWItemBoxTracker.Service;
-using MHWItemBoxTracker.ViewModels;
-
-namespace MHWItemBoxTracker.GUI {
-  public partial class Settings : UserControl, ISettings {
-    public bool IsSettingsChanged => true;
-    private ItemBoxTrackerViewModel vm;
-    private ConfigService Config;
-
-    public Settings(ConfigService Config) : base() {
-      this.Config = Config;
-      InitializeComponent();
-      vm = new ItemBoxTrackerViewModel(new ItemBoxTrackerConfig());
-      DataContext = vm;
-    }
-
-    public async void LoadSettings() {
-      var config = await Config.LoadAsync();
-      vm = new ItemBoxTrackerViewModel(config);
-      DataContext = vm;
-    }
-
-    public async void SaveSettings() {
-      await Config.SaveAsync(vm.ToConfig());
-    }
-
-    public string ValidateSettings() {
-      return null;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e) {
-      LoadItems();
-    }
-
-    private void LoadItems() {
-      if (GMD.Items.gValuesOffsets != null) {
-        var items = new ObservableCollection<ItemViewModel>(Enumerable
-          .Range(0, GMD.Items.gValuesOffsets.Length / 2)
-          .Select(id => new ItemViewModel {
-            ItemId = id,
-            Name = GMD.GetItemNameById(id)
-          })
-          .Where(item => item.Name != null)
-          .ToList());
-
-        vm.Items.Clear();
-        foreach (var item in items) {
-          vm.Items.Add(item);
-        }
-      }
-    }
-  }
-}
diff --git a/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml b/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml
deleted file mode 100644
index 47b1f1c..0000000
--- a/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml
+++ /dev/null
@@ -1,111 +0,0 @@
-<UserControl
-    x:Class="MHWItemBoxTracker.GUI.SettingsTab"
-    xmlns:local="clr-namespace:MHWItemBoxTracker.GUI"
-    xmlns:vm="clr-namespace:MHWItemBoxTracker.ViewModels"
-    xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
-    xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
-    xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-  <StackPanel>
-
-    <Grid HorizontalAlignment="Center">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-      <TextBlock
-          Grid.Column="0"
-          Text="🚧"
-          Padding="5 0"
-          Foreground="Yellow"
-          FontSize="32" />
-      <TextBlock
-          Grid.Column="1"
-          Text="This is a WIP. Some settings don't do anything yet. They will soon, though..."
-          Foreground="#cc9E9D9D" />
-      <TextBlock
-          Grid.Column="2"
-          Text="🚧"
-          Padding="5 0"
-          Foreground="Yellow"
-          FontSize="32" />
-    </Grid>
-
-    <Custom:Switcher
-        Text="Track items in pouch"
-        IsEnabled="{Binding TrackPouch, Mode=TwoWay}" />
-    <Custom:Switcher
-        Text="Track items in box"
-        IsEnabled="{Binding TrackBox, Mode=TwoWay}" />
-    <Custom:Switcher
-        Text="Track craftable items"
-        IsEnabled="{Binding TrackCraftable, Mode=TwoWay}" />
-
-    <GroupBox
-        Header="Items to track"
-        Foreground="WhiteSmoke"
-        BorderBrush="{x:Null}">
-      <StackPanel>
-        <Button
-            Content="Add another"
-            Width="100"
-            HorizontalAlignment="Right"
-            Click="AddRow"
-            Style="{StaticResource buttons_settings}" />
-        <local:DragAndDropper>
-          <local:DragAndDropper.Child>
-            <ListView
-                ItemsSource="{Binding Tracking, Mode=TwoWay}"
-                BorderThickness="0">
-              <ListView.Background>
-                <SolidColorBrush
-                    Color="#00000000"
-                    Opacity="0" />
-              </ListView.Background>
-              <ListView.ItemTemplate>
-                <!-- <DataTemplate x:DataType="vm:ItemViewModel"> -->
-                <DataTemplate>
-                  <StackPanel Orientation="Horizontal">
-                    <Button
-                        ToolTip="Move up"
-                        Click="MoveUp"
-                        Content="▲" />
-                    <Button
-                        ToolTip="Move down"
-                        Click="MoveDown"
-                        Content="▼" />
-                    <local:AutoSuggestBox
-                        Placeholder="Search items..."
-                        NoResultsText="{Binding DataContext.Items.Count, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={convert:CountToString Zero=Please launch the game to enable this search and then reload this screen once HunterPie has loaded the strings, More=No Results...}}"
-                        Selection="{Binding DataContext, RelativeSource={RelativeSource AncestorType=StackPanel}, Mode=TwoWay}"
-                        OnTextChanged="OnTextChanged"
-                        OnSuggestionChosen="OnSuggestionChosen"
-                        OnClearSelection="OnClearSelection"
-                        Width="250" />
-                    <Custom:TextInput
-                        Label="Amount"
-                        IsEnabled="{Binding ItemId}"
-                        Width="100"
-                        Text="{Binding Amount, Mode=TwoWay}" />
-                    <Button
-                        ToolTip="Delete row"
-                        Foreground="Red"
-                        Click="DeleteRow"
-                        Content="✘" />
-                  </StackPanel>
-                </DataTemplate>
-              </ListView.ItemTemplate>
-            </ListView>
-          </local:DragAndDropper.Child>
-        </local:DragAndDropper>
-      </StackPanel>
-    </GroupBox>
-  </StackPanel>
-</UserControl>
diff --git a/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs b/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs
deleted file mode 100644
index 7319d9b..0000000
--- a/ItemBoxTracker/src/Plugin/Views/SettingsTab.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using MHWItemBoxTracker.ViewModels;
-
-namespace MHWItemBoxTracker.GUI {
-  public partial class SettingsTab : UserControl {
-    public SettingsTab() : base() {
-      InitializeComponent();
-    }
-
-    private void DeleteRow(object sender, RoutedEventArgs e) {
-      var item = ((FrameworkElement)sender).DataContext as ItemViewModel;
-      var Tracking = ((TrackingTabViewModel)DataContext).Tracking;
-      Tracking.Remove(item);
-      if (Tracking.Count == 0) {
-        Tracking.Add(new ItemViewModel());
-      }
-    }
-    private void AddRow(object sender, RoutedEventArgs e) {
-      ((TrackingTabViewModel)DataContext).Tracking.Add(new ItemViewModel());
-    }
-    private void MoveUp(object sender, RoutedEventArgs e) {
-      var item = ((FrameworkElement)sender).DataContext as ItemViewModel;
-      var Tracking = ((TrackingTabViewModel)DataContext).Tracking;
-      var index = Tracking.IndexOf(item);
-      if (index > 0) {
-        Tracking.Move(index, index - 1);
-      }
-    }
-
-    private void MoveDown(object sender, RoutedEventArgs e) {
-      var item = ((FrameworkElement)sender).DataContext as ItemViewModel;
-      var Tracking = ((TrackingTabViewModel)DataContext).Tracking;
-      var index = Tracking.IndexOf(item);
-      if (index < Tracking.Count - 1) {
-        Tracking.Move(index, index + 1);
-      }
-    }
-
-    private void OnTextChanged(ObservableCollection<object> suggestions, string input) {
-      var DC = DataContext as TrackingTabViewModel;
-      var items = DC.Items
-        .Where(
-          item => CultureInfo.CurrentCulture.CompareInfo
-            .IndexOf(item.Name, input, CompareOptions.IgnoreCase) >= 0)
-        .Where(item => !DC.Tracking.Contains(item));
-
-      suggestions.Clear();
-      foreach (var item in items) {
-        suggestions.Add(item);
-      }
-    }
-    private void OnSuggestionChosen(object selection, object choice) {
-      var Selection = (ItemViewModel)selection;
-      var Choice = (ItemViewModel)choice;
-      Selection.ItemId = Choice.ItemId;
-      Selection.Name = Choice.Name;
-    }
-    private void OnClearSelection(object selection) {
-      var Selection = (ItemViewModel)selection;
-      Selection.ItemId = 0;
-    }
-  }
-}
diff --git a/ItemBoxTracker/src/Plugin/Views/Settings.xaml b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml
similarity index 69%
rename from ItemBoxTracker/src/Plugin/Views/Settings.xaml
rename to ItemBoxTracker/src/Plugin/Views/SettingsView.xaml
index 416828a..43537f2 100644
--- a/ItemBoxTracker/src/Plugin/Views/Settings.xaml
+++ b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml
@@ -1,15 +1,15 @@
 <UserControl
-    x:Class="MHWItemBoxTracker.GUI.Settings"
-    xmlns:local="clr-namespace:MHWItemBoxTracker.GUI"
+    x:Class="MHWItemBoxTracker.Views.SettingsView"
+    xmlns:local="clr-namespace:MHWItemBoxTracker.Views"
     xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
     xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:Behaviors="http://schemas.microsoft.com/xaml/behaviors"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    Loaded="OnLoaded"
     mc:Ignorable="d">
   <UserControl.Resources>
     <ResourceDictionary>
@@ -19,6 +19,13 @@
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </UserControl.Resources>
+
+  <Behaviors:Interaction.Triggers>
+    <Behaviors:EventTrigger EventName="Loaded">
+      <Behaviors:InvokeCommandAction Command="{Binding LoadItems}" />
+    </Behaviors:EventTrigger>
+  </Behaviors:Interaction.Triggers>
+
   <TabControl BorderThickness="0">
     <TabControl.Background>
       <SolidColorBrush
@@ -30,19 +37,19 @@
         Header="Always"
         Width="150"
         Margin="1 0">
-      <local:SettingsTab DataContext="{Binding Always}" />
+      <local:TrackingTabView DataContext="{Binding Always}" />
     </TabItem>
     <TabItem
         Header="Village"
         Width="150"
         Margin="1 0">
-      <local:SettingsTab DataContext="{Binding Village}" />
+      <local:TrackingTabView DataContext="{Binding Village}" />
     </TabItem>
     <TabItem
         Header="Quest"
         Width="150"
         Margin="1 0">
-      <local:SettingsTab DataContext="{Binding Quest}" />
+      <local:TrackingTabView DataContext="{Binding Quest}" />
     </TabItem>
 
   </TabControl>
diff --git a/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
new file mode 100644
index 0000000..99bc04f
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
@@ -0,0 +1,33 @@
+using System.Windows.Controls;
+using HunterPie.Settings;
+using MHWItemBoxTracker.Service;
+using MHWItemBoxTracker.ViewModel;
+
+namespace MHWItemBoxTracker.Views {
+  public partial class SettingsView : UserControl, ISettings {
+    public bool IsSettingsChanged => true;
+    private SettingsViewModel VM;
+    private ConfigService Config;
+
+    public SettingsView(ConfigService Config) : base() {
+      this.Config = Config;
+      InitializeComponent();
+      VM = new(new());
+      DataContext = VM;
+    }
+
+    public async void LoadSettings() {
+      var config = await Config.LoadAsync();
+      VM = new(config);
+      DataContext = VM;
+    }
+
+    public async void SaveSettings() {
+      await Config.SaveAsync();
+    }
+
+    public string ValidateSettings() {
+      return null;
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml
new file mode 100644
index 0000000..478e414
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml
@@ -0,0 +1,117 @@
+<UserControl
+    x:Class="MHWItemBoxTracker.Views.TrackingTabView"
+    xmlns:local="clr-namespace:MHWItemBoxTracker.Views"
+    xmlns:vm="clr-namespace:MHWItemBoxTracker.ViewModel"
+    xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
+    xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
+    xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:Behaviors="http://schemas.microsoft.com/xaml/behaviors"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+  <StackPanel>
+    <Grid HorizontalAlignment="Center">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+      <TextBlock
+          Grid.Column="0"
+          Text="🚧"
+          Padding="5 0"
+          Foreground="Yellow"
+          FontSize="32" />
+      <TextBlock
+          Grid.Column="1"
+          Text="This is a WIP. Some settings don't do anything yet. They will soon, though..."
+          Foreground="#cc9E9D9D" />
+      <TextBlock
+          Grid.Column="2"
+          Text="🚧"
+          Padding="5 0"
+          Foreground="Yellow"
+          FontSize="32" />
+    </Grid>
+
+    <Custom:Switcher
+        Text="Track items in pouch"
+        IsEnabled="{Binding Model.TrackPouch, Mode=TwoWay}" />
+    <Custom:Switcher
+        Text="Track items in box"
+        IsEnabled="{Binding Model.TrackBox, Mode=TwoWay}" />
+    <Custom:Switcher
+        Text="Track craftable items"
+        IsEnabled="{Binding Model.TrackCraftable, Mode=TwoWay}" />
+
+    <GroupBox
+        Header="Items to track"
+        Foreground="WhiteSmoke"
+        BorderBrush="{x:Null}">
+      <StackPanel>
+        <Button
+            Content="Add another"
+            Width="100"
+            HorizontalAlignment="Right"
+            Command="{Binding AddRow}"
+            Style="{StaticResource buttons_settings}" />
+        <ItemsControl
+            ItemsSource="{Binding Model.Tracking, Mode=TwoWay}"
+            BorderThickness="0">
+          <ItemsControl.Background>
+            <SolidColorBrush
+                Color="#00000000"
+                Opacity="0" />
+          </ItemsControl.Background>
+          <ItemsControl.ItemTemplate>
+            <DataTemplate>
+              <StackPanel Orientation="Horizontal">
+                <Button
+                    ToolTip="Move up"
+                    Command="{Binding DataContext.MoveUp, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    CommandParameter="{Binding}"
+                    Content="▲" />
+                <Button
+                    ToolTip="Move down"
+                    Command="{Binding DataContext.MoveDown, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    CommandParameter="{Binding}"
+                    Content="▼" />
+                <local:AutoSuggestBox
+                    Placeholder="Search items..."
+                    NoResultsText="{Binding DataContext.Items.Count, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={convert:CountToString Zero=Please launch the game to enable this search and then reload this screen once HunterPie has loaded the strings, More=No Results...}}"
+                    Width="250">
+                  <local:AutoSuggestBox.VM>
+                    <MultiBinding Converter="{convert:ItemToViewModel}">
+                      <Binding Mode="TwoWay" />
+                      <Binding
+                          Path="DataContext.Items"
+                          RelativeSource="{RelativeSource AncestorType=UserControl}" />
+                      <Binding
+                          Path="DataContext.Model.Tracking"
+                          RelativeSource="{RelativeSource AncestorType=UserControl}" />
+                    </MultiBinding>
+                  </local:AutoSuggestBox.VM>
+                </local:AutoSuggestBox>
+                <Custom:TextInput
+                    Label="Amount"
+                    IsEnabled="{Binding ItemId}"
+                    Width="100"
+                    Text="{Binding Amount, Mode=TwoWay}" />
+                <Button
+                    ToolTip="Delete row"
+                    Foreground="Red"
+                    Command="{Binding DataContext.DeleteRow, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    CommandParameter="{Binding}"
+                    Content="✘" />
+              </StackPanel>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+        </ItemsControl>
+      </StackPanel>
+    </GroupBox>
+  </StackPanel>
+</UserControl>
diff --git a/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
new file mode 100644
index 0000000..eebb4b9
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace MHWItemBoxTracker.Views {
+  public partial class TrackingTabView : UserControl {
+    public TrackingTabView() : base() {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs b/ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs
index 5bedb8d..524a938 100644
--- a/ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs
+++ b/ItemBoxTracker/src/Shareables/Utils/NotifyPropertyChanged.cs
@@ -16,6 +16,6 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string prope
       return true;
     }
 
-    protected string CallerId { get => new StackTrace().GetFrames()[2].GetMethod().Name; }
+    protected string CallerId { get => $"{new StackTrace().GetFrames()[2].GetMethod().Name} {new StackTrace().GetFrames()[3].GetMethod().Name}"; }
   }
 }
diff --git a/ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs b/ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs
deleted file mode 100644
index fe36fc2..0000000
--- a/ItemBoxTracker/src/Shareables/ViewModel/AutoSuggestBoxViewModel.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Windows.Input;
-using HunterPie.UI.Infrastructure;
-using MHWItemBoxTracker.Utils;
-
-namespace MHWItemBoxTracker.ViewModels {
-  public class AutoSuggestBoxViewModel : NotifyPropertyChanged {
-    // From DependencyProperties
-    private object selection;
-    public object Selection {
-      get => selection;
-      set => SetField(ref selection, value);
-    }
-    public Action<ObservableCollection<object>, string> OnTextChanged;
-    public Action<object, object> OnSuggestionChosen;
-    public AutoSuggestBoxViewModel(Action<ObservableCollection<object>, string> OnTextChanged,
-                                   Action<object, object> OnSuggestionChosen) {
-      this.OnTextChanged = OnTextChanged;
-      this.OnSuggestionChosen = OnSuggestionChosen;
-
-      OnEnter = new ArglessRelayCommand(onEnter);
-      OnDownKey = new ArglessRelayCommand(onDownKey);
-      OnUpKey = new ArglessRelayCommand(onUpKey);
-      OnEscape = new ArglessRelayCommand(() => { ShowPopup = false; });
-    }
-
-    // IMO this is still tight coupling with the View
-    private ObservableCollection<object> suggestions = new();
-    private bool isEnabled = true;
-    private string searchQuery;
-    private int selectedIndex;
-    private bool showPopup;
-    public ObservableCollection<object> Suggestions {
-      get => suggestions;
-      set => SetField(ref suggestions, value);
-    }
-    public bool IsEnabled {
-      get => isEnabled;
-      set => SetField(ref isEnabled, value);
-    }
-    public string SearchQuery {
-      get => searchQuery;
-      set {
-        SetField(ref searchQuery, value);
-        TextChanged();
-      }
-    }
-    public int SelectedIndex {
-      get => selectedIndex;
-      set {
-        SetField(ref selectedIndex, value);
-        if (CallerId == "InvokeMethod") {
-          SelectionChanged();
-        }
-      }
-    }
-    public bool ShowPopup {
-      get => showPopup;
-      set => SetField(ref showPopup, value);
-    }
-
-    private void TextChanged() {
-      if (string.IsNullOrEmpty(SearchQuery)) {
-        ShowPopup = false;
-      } else {
-        ShowPopup = true;
-        OnTextChanged(Suggestions, SearchQuery);
-      }
-    }
-
-    public ICommand OnEnter { get; }
-    public ICommand OnDownKey { get; }
-    public ICommand OnUpKey { get; }
-    public ICommand OnEscape { get; }
-    private void onEnter() {
-      if (SelectedIndex >= 0) {
-        DisplaySelection();
-      } else if (!string.IsNullOrEmpty(SearchQuery)) {
-        OnTextChanged(Suggestions, SearchQuery);
-        if (Suggestions.Count > 0) {
-          // triggers SelectionChanged, so no need to call DisplaySelection()
-          SelectedIndex = 0;
-        }
-      }
-    }
-    private void onDownKey() {
-      var count = Suggestions.Count;
-      if (count > 0 && SelectedIndex < (count - 1)) {
-        ShowPopup = true;
-        SelectedIndex++;
-      }
-    }
-    private void onUpKey() {
-      if (Suggestions.Count > 0 && SelectedIndex > -1) {
-        SelectedIndex--;
-      }
-    }
-
-    private void SelectionChanged() {
-      if (SelectedIndex >= 0) {
-        DisplaySelection();
-      }
-    }
-
-    private void DisplaySelection() {
-      ShowPopup = false;
-      OnSuggestionChosen(Selection, Suggestions[SelectedIndex]);
-      SelectedIndex = -1;
-
-      IsEnabled = false;
-      SearchQuery = "";
-    }
-  }
-}
diff --git a/ItemBoxTracker/src/Shareables/ViewModel/SearchableViewModel.cs b/ItemBoxTracker/src/Shareables/ViewModel/SearchableViewModel.cs
new file mode 100644
index 0000000..3cb740c
--- /dev/null
+++ b/ItemBoxTracker/src/Shareables/ViewModel/SearchableViewModel.cs
@@ -0,0 +1,105 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Input;
+using HunterPie.UI.Infrastructure;
+using MHWItemBoxTracker.Utils;
+
+namespace MHWItemBoxTracker.ViewModel {
+  public abstract class SearchableViewModel : NotifyPropertyChanged {
+    public virtual object Data { get; }
+    private ICollectionView suggestionsView;
+    private string searchQuery;
+    private bool showPopup;
+    private bool isEnabled = true;
+
+    public abstract bool SuggestionsFilter(object candidate);
+    public abstract void SuggestionChosen();
+    public abstract void ClearSelection();
+    public SearchableViewModel(object Data) {
+      this.Data = Data;
+
+      OnEnter = new ArglessRelayCommand(onEnter);
+      OnDownKey = new ArglessRelayCommand(onDownKey);
+      OnUpKey = new ArglessRelayCommand(onUpKey);
+      OnEscape = new ArglessRelayCommand(() => { ShowPopup = false; });
+      OnClear = new ArglessRelayCommand(() => {
+        IsEnabled = true;
+        ClearSelection();
+      });
+      OnListSelected = new ArglessRelayCommand(DisplaySelection);
+      OnLoaded = new ArglessRelayCommand(onLoaded);
+    }
+    public virtual bool IsEnabled {
+      get => isEnabled;
+      set => SetField(ref isEnabled, value);
+    }
+    public virtual string SearchQuery {
+      get => searchQuery;
+      set {
+        SetField(ref searchQuery, value);
+        ShowPopup = !string.IsNullOrEmpty(SearchQuery);
+        SuggestionsView.Refresh();
+        SuggestionsView.MoveCurrentToPosition(-1);
+      }
+    }
+
+    public virtual ICollectionView SuggestionsView {
+      get => suggestionsView;
+      set {
+        SetField(ref suggestionsView, value);
+        SuggestionsView.Filter =
+          candidate => string.IsNullOrEmpty(SearchQuery) || SuggestionsFilter(candidate);
+      }
+    }
+    public virtual bool ShowPopup {
+      get => showPopup;
+      set => SetField(ref showPopup, value);
+    }
+
+    public ICommand OnEnter { get; }
+    public ICommand OnDownKey { get; }
+    public ICommand OnUpKey { get; }
+    public ICommand OnEscape { get; }
+    public ICommand OnLoaded { get; }
+    public ICommand OnClear { get; }
+    public ICommand OnListSelected { get; }
+    private void onEnter() {
+      if (SuggestionsView.CurrentPosition >= 0) {
+        DisplaySelection();
+      } else if (!string.IsNullOrEmpty(SearchQuery)) {
+        SuggestionsView.Refresh();
+        if (SuggestionsView.MoveCurrentToFirst()) {
+          DisplaySelection();
+        }
+      }
+    }
+    private void onDownKey() {
+      if (!SuggestionsView.IsEmpty) {
+        ShowPopup = true;
+        SuggestionsView.MoveCurrentToNext();
+      }
+    }
+    private void onUpKey() {
+      SuggestionsView.MoveCurrentToPrevious();
+    }
+
+    private void onLoaded() {
+      var empty = Activator.CreateInstance(Data.GetType());
+      if (!empty.Equals(Data)) {
+        IsEnabled = false;
+      }
+      // else {
+      //   searchInput.Focus();
+      // }
+    }
+
+    private void DisplaySelection() {
+      if (SuggestionsView.CurrentPosition >= 0) {
+        ShowPopup = false;
+        SuggestionChosen();
+        IsEnabled = false;
+        SearchQuery = "";
+      }
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
index 6960983..3eccb42 100644
--- a/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
+++ b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
@@ -1,14 +1,15 @@
 <UserControl
-    x:Class="MHWItemBoxTracker.GUI.AutoSuggestBox"
+    x:Class="MHWItemBoxTracker.Views.AutoSuggestBox"
     x:Name="AutoSuggest"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:Behaviors="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:b="MHWItemBoxTracker.Behaviors"
     xmlns:convert="clr-namespace:HunterPie.UI.Infrastructure.Converters;assembly=HunterPie.UI"
     mc:Ignorable="d"
     Margin="10,0,10,5"
-    Loaded="OnLoaded"
     d:DesignWidth="200">
   <UserControl.Resources>
     <ResourceDictionary>
@@ -19,17 +20,17 @@
               FalseValue="Visible"
               TrueValue="Hidden" />
         </ResourceDictionary>
-        <ResourceDictionary>
-          <convert:LengthToVisibilityConverter
-              x:Key="EmptyToVisible"
-              WhenEmpty="Visible"
-              WhenValues="Hidden" />
-        </ResourceDictionary>
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </UserControl.Resources>
 
-  <StackPanel x:Name="Root">
+  <StackPanel DataContext="{Binding VM, RelativeSource={RelativeSource AncestorType=UserControl}}">
+    <Behaviors:Interaction.Triggers>
+      <Behaviors:EventTrigger EventName="Loaded">
+        <Behaviors:InvokeCommandAction Command="{Binding OnLoaded}" />
+      </Behaviors:EventTrigger>
+    </Behaviors:Interaction.Triggers>
+
     <Border
         BorderBrush="#FFABADB3"
         BorderThickness="0 0 0 1"
@@ -83,11 +84,11 @@
             </Grid.ColumnDefinitions>
             <ContentControl
                 Grid.Column='0'
-                Content="{Binding Selection}" />
+                Content="{Binding Data}" />
             <Button
                 Grid.Column='1'
                 Foreground="#cc9E9D9D"
-                Click="ClearSelection"
+                Command="{Binding OnClear}"
                 Content="✘" />
           </Grid>
         </Border>
@@ -110,12 +111,18 @@
         Placement="Bottom">
       <Grid>
         <ListBox
-            ItemsSource="{Binding Suggestions}"
-            SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-            Visibility="{Binding Suggestions.Count, Converter={convert:LengthToVisibilityConverter}}"
-            SelectionChanged="SelectionChanged"
+            ItemsSource="{Binding SuggestionsView}"
+            Visibility="{Binding SuggestionsView.IsEmpty, Converter={StaticResource InverseBool2Visibility}}"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-            Background="{x:Null}" />
+            SelectionChanged="SelectionChanged"
+            IsSynchronizedWithCurrentItem="True"
+            Background="{x:Null}">
+          <Behaviors:Interaction.Triggers>
+            <Behaviors:EventTrigger EventName="MouseLeftButtonUp">
+              <Behaviors:InvokeCommandAction Command="{Binding OnListSelected}" />
+            </Behaviors:EventTrigger>
+          </Behaviors:Interaction.Triggers>
+        </ListBox>
 
         <TextBlock
             TextWrapping="Wrap"
@@ -123,7 +130,7 @@
             Text="{Binding NoResultsText, RelativeSource={RelativeSource AncestorType=UserControl}}"
             VerticalAlignment="Center"
             Padding="5 0"
-            Visibility="{Binding Suggestions.Count, Converter={StaticResource EmptyToVisible}}"
+            Visibility="{Binding SuggestionsView.IsEmpty, Converter={convert:BooleanToVisibilityConverter}}"
             Foreground="#ffbfbfbf" />
       </Grid>
     </Popup>
diff --git a/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs
index ef0db1a..83a97e8 100644
--- a/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs
+++ b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml.cs
@@ -1,34 +1,11 @@
-using System;
-using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;
-using MHWItemBoxTracker.ViewModels;
+using MHWItemBoxTracker.ViewModel;
 
-namespace MHWItemBoxTracker.GUI {
+namespace MHWItemBoxTracker.Views {
   public partial class AutoSuggestBox : UserControl {
-    public AutoSuggestBoxViewModel VM { get; }
     public AutoSuggestBox() {
       InitializeComponent();
-      VM = new AutoSuggestBoxViewModel(
-        (suggestions, input) => OnTextChanged(suggestions, input),
-        (selection, selectedItem) => OnSuggestionChosen(selection, selectedItem)
-      );
-      Root.DataContext = VM;
-    }
-
-    // Couldn't get away from this :(
-    private void ClearSelection(object sender, RoutedEventArgs e) {
-      OnClearSelection(Selection);
-      searchInput.IsEnabled = true;
-      searchInput.Focus();
-    }
-    private void OnLoaded(object sender, RoutedEventArgs e) {
-      var empty = Activator.CreateInstance(Selection.GetType());
-      if (!empty.Equals(Selection)) {
-        searchInput.IsEnabled = false;
-      } else {
-        searchInput.Focus();
-      }
     }
 
     private void SelectionChanged(object sender, RoutedEventArgs e) {
@@ -36,55 +13,6 @@ private void SelectionChanged(object sender, RoutedEventArgs e) {
       theList.ScrollIntoView(theList.SelectedItem);
     }
 
-    /// <summary>
-    /// Event triggers when the text in the textbox changes (for every change)
-    /// Also triggers when the user submits a search query by hitting Enter.
-    /// <param name="suggestions"/> the ObservableCollection to update with new suggestions
-    /// <param name="input"/> current user input
-    /// <example>
-    /// <code>
-    /// private void OnTextChanged(ObservableCollection<object> suggestions, string input) {
-    ///   var filtered = searchSpace.Where(s => s.Contains(input));
-    ///   suggestions.Clear();
-    ///   foreach (var choice in filtered) {
-    ///     suggestions.Add(choice);
-    ///   }
-    /// }
-    /// </code>
-    /// </example>
-    /// </summary>
-    public event Action<ObservableCollection<object>, string> OnTextChanged = (suggestions, input) => { };
-    /// <summary>
-    /// Event triggers when the user clicks the X on their selection
-    /// <param name="selection"/> the selection view model given as <see cref="Selection" />
-    /// <example>
-    /// <code>
-    /// private void OnClearSelection(object selection) {
-    ///   var Selection = (MyViewModel)selection;
-    ///   makeInvalid(Selection);
-    /// }
-    /// </code>
-    /// </example>
-    /// </summary>
-    public event Action<object> OnClearSelection = selection => { };
-    /// <summary>
-    /// Event triggers when the user chooses a selection.
-    /// Also triggers when the user submits a search query by hitting Enter and there is at least 1 result.
-    /// The top result is sent with this event.
-    /// <param name="selection"/> the selection view model given as <see cref="Selection" />
-    /// <param name="choice"/> the selected list item from the suggestions ObservableCollection. i.e.: the <c>ListItem</c>'s <c>DataContext</c>
-    /// <example>
-    /// <code>
-    /// private void OnSuggestionChosen(object selection, object choice) {
-    ///   var Selection = (MyViewModel)selection;
-    ///   var Choice = (ProbablyTheSameViewModelButDoesNotHaveToBe)choice;
-    ///   DoWhateverYouNeedToMakeSelectionReflectTheChoice(Selection, Choice);
-    /// }
-    /// </code>
-    /// </example>
-    /// </summary>
-    public event Action<object, object> OnSuggestionChosen = (selection, selectedItem) => { };
-
     public static readonly DependencyProperty PlaceholderProperty = DependencyProperty.Register(
     "Placeholder", typeof(string), typeof(AutoSuggestBox), new PropertyMetadata("Search..."));
     /// <value>
@@ -108,19 +36,17 @@ public string NoResultsText {
       get { return (string)GetValue(NoResultsProperty); }
       set { SetValue(NoResultsProperty, value); }
     }
-    public static readonly DependencyProperty SelectionProperty = DependencyProperty.Register(
-    "Selection", typeof(object), typeof(AutoSuggestBox), new PropertyMetadata(null, (d, e) => {
-      var control = d as AutoSuggestBox;
-      control.VM.Selection = e.NewValue;
-    }));
+    public static readonly DependencyProperty VMProperty = DependencyProperty.Register(
+    "VM", typeof(SearchableViewModel), typeof(AutoSuggestBox), new PropertyMetadata(null));
     /// <value>
-    /// DependencyProperty <c>Selection</c>
-    /// is the viewmodel that will hold the user's selection.
+    /// DependencyProperty <c>VM</c>
+    /// is the viewmodel to bind to the searchbox.
     /// Default isn't very useful
+    /// See SearchableViewModel
     /// </value>
-    public object Selection {
-      get { return (object)GetValue(SelectionProperty); }
-      set { SetValue(SelectionProperty, value); }
+    public SearchableViewModel VM {
+      get { return (SearchableViewModel)GetValue(VMProperty); }
+      set { SetValue(VMProperty, value); }
     }
   }
 }
diff --git a/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml
index dd6f499..a910b79 100644
--- a/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml
+++ b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="MHWItemBoxTracker.GUI.DragAndDropper"
+    x:Class="MHWItemBoxTracker.Views.DragAndDropper"
     x:Name="DragAndDrop"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs
index d2e59f8..2589371 100644
--- a/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs
+++ b/ItemBoxTracker/src/Shareables/Views/DragAndDropper.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace MHWItemBoxTracker.GUI {
+namespace MHWItemBoxTracker.Views {
   // TODO: revisit this some day
   public partial class DragAndDropper : UserControl {
 

From eef19a72daa01fd51effeb7fc8b9f3b80bbe1435 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Thu, 13 May 2021 01:41:35 -0400
Subject: [PATCH 09/14] refactor(Model): rename models appropriately

---
 .../src/Plugin/Converter/ItemToViewModel.cs   |  6 +++---
 .../src/Plugin/GUI/ItemDataTemplate.xaml      |  2 +-
 .../Model/DeprecatedItemBoxTrackerConfig.cs   |  2 +-
 .../Model/{ItemConfig.cs => ItemModel.cs}     |  4 ++--
 ...emBoxTrackerConfig.cs => SettingsModel.cs} | 14 ++++++-------
 .../src/Plugin/Model/TrackingTabConfig.cs     |  6 +++---
 .../src/Plugin/Service/ConfigService.cs       |  8 ++++----
 .../src/Plugin/ViewModel/ItemBoxTracker.cs    |  2 +-
 .../src/Plugin/ViewModel/ItemViewModel.cs     | 14 ++++++-------
 .../src/Plugin/ViewModel/SettingsViewModel.cs | 12 +++++------
 .../Plugin/ViewModel/TrackingTabViewModel.cs  | 20 +++++++++----------
 scripts/gen-settings-json.csx                 |  2 +-
 12 files changed, 46 insertions(+), 46 deletions(-)
 rename ItemBoxTracker/src/Plugin/Model/{ItemConfig.cs => ItemModel.cs} (89%)
 rename ItemBoxTracker/src/Plugin/Model/{ItemBoxTrackerConfig.cs => SettingsModel.cs} (66%)

diff --git a/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
index fb76c81..3e49250 100644
--- a/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
@@ -9,9 +9,9 @@
 namespace MHWItemBoxTracker.Converter {
   public class ItemToViewModel : MarkupExtension, IMultiValueConverter {
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
-      var item = values[0] as ItemConfig;
-      var suggestions = values[1] as ObservableCollection<ItemConfig>;
-      var currentlySelected = values[2] as ObservableCollection<ItemConfig>;
+      var item = values[0] as ItemModel;
+      var suggestions = values[1] as ObservableCollection<ItemModel>;
+      var currentlySelected = values[2] as ObservableCollection<ItemModel>;
 
       return new ItemViewModel(item) {
         SuggestionsView = CollectionViewSource.GetDefaultView(suggestions),
diff --git a/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml b/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
index 76a6244..99f5895 100644
--- a/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
+++ b/ItemBoxTracker/src/Plugin/GUI/ItemDataTemplate.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:data="clr-namespace:MHWItemBoxTracker.Model"
     xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter">
-  <DataTemplate DataType="{x:Type data:ItemConfig}">
+  <DataTemplate DataType="{x:Type data:ItemModel}">
     <StackPanel Orientation="Horizontal">
       <StackPanel.ToolTip>
         <StackPanel>
diff --git a/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
index 8f4634d..ac1dd94 100644
--- a/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/DeprecatedItemBoxTrackerConfig.cs
@@ -5,6 +5,6 @@ namespace MHWItemBoxTracker.Model {
   public class DeprecatedItemBoxTrackerConfig {
     [DisplayName("Items to Track")]
     [Description("You can find item IDs here: https://github.com/Ezekial711/MonsterHunterWorldModding/wiki/Item-IDs")]
-    public List<ItemConfig> Tracking { get; set; } = new List<ItemConfig>();
+    public List<ItemModel> Tracking { get; set; } = new List<ItemModel>();
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs b/ItemBoxTracker/src/Plugin/Model/ItemModel.cs
similarity index 89%
rename from ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/ItemModel.cs
index 299a9b8..7125ae5 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/ItemModel.cs
@@ -2,7 +2,7 @@
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class ItemConfig : NotifyPropertyChanged {
+  public class ItemModel : NotifyPropertyChanged {
     private string name;
     public int itemId;
     public int amount;
@@ -26,7 +26,7 @@ public int Amount {
 
     public override bool Equals(object obj) {
       if ((obj != null) && GetType().Equals(obj.GetType())) {
-        var Obj = (ItemConfig)obj;
+        var Obj = (ItemModel)obj;
         return Obj.ItemId == ItemId;
       }
       return false;
diff --git a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs b/ItemBoxTracker/src/Plugin/Model/SettingsModel.cs
similarity index 66%
rename from ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
rename to ItemBoxTracker/src/Plugin/Model/SettingsModel.cs
index 96ff399..847e34b 100644
--- a/ItemBoxTracker/src/Plugin/Model/ItemBoxTrackerConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/SettingsModel.cs
@@ -2,28 +2,28 @@
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class ItemBoxTrackerConfig : NotifyPropertyChanged {
-    private TrackingTabConfig always = new();
-    private TrackingTabConfig village = new();
-    private TrackingTabConfig quest = new();
+  public class SettingsModel : NotifyPropertyChanged {
+    private TrackingTabModel always = new();
+    private TrackingTabModel village = new();
+    private TrackingTabModel quest = new();
 
     [DisplayName("Track Always")]
     [Description("Items to track everywhere")]
-    public TrackingTabConfig Always {
+    public TrackingTabModel Always {
       get => always;
       set => SetField(ref always, value);
     }
 
     [DisplayName("Track in Village")]
     [Description("Items to track only in the village/gathering hub")]
-    public TrackingTabConfig Village {
+    public TrackingTabModel Village {
       get => village;
       set => SetField(ref village, value);
     }
 
     [DisplayName("Track in Quest")]
     [Description("Items to track during a quest/expedition/guiding lands")]
-    public TrackingTabConfig Quest {
+    public TrackingTabModel Quest {
       get => quest;
       set => SetField(ref quest, value);
     }
diff --git a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
index a436296..20cd454 100644
--- a/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
+++ b/ItemBoxTracker/src/Plugin/Model/TrackingTabConfig.cs
@@ -3,11 +3,11 @@
 using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Model {
-  public class TrackingTabConfig : NotifyPropertyChanged {
+  public class TrackingTabModel : NotifyPropertyChanged {
     private bool trackPouch = false;
     private bool trackBox = true;
     private bool trackCraftable = false;
-    private ObservableCollection<ItemConfig> tracking = new();
+    private ObservableCollection<ItemModel> tracking = new();
 
     [DisplayName("Track items in pouch")]
     [Description("Enable to count items in your pouch on the progress bars")]
@@ -31,7 +31,7 @@ public bool TrackCraftable {
     }
 
     [DisplayName("Items to Track")]
-    public ObservableCollection<ItemConfig> Tracking {
+    public ObservableCollection<ItemModel> Tracking {
       get => tracking;
       set => SetField(ref tracking, value);
     }
diff --git a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
index 16ae625..44a83cb 100644
--- a/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
+++ b/ItemBoxTracker/src/Plugin/Service/ConfigService.cs
@@ -11,17 +11,17 @@ namespace MHWItemBoxTracker.Service {
   public class ConfigService {
     public static string settings = "settings.json";
     private static readonly SemaphoreSlim locke = new(1, 1);
-    private ItemBoxTrackerConfig Config;
+    private SettingsModel Config;
 
-    public async Task<ItemBoxTrackerConfig> LoadAsync() {
+    public async Task<SettingsModel> LoadAsync() {
       await locke.WaitAsync();
       try {
         if (Config == null) {
-          var config = await Plugin.LoadJson<ItemBoxTrackerConfig>(settings);
+          var config = await Plugin.LoadJson<SettingsModel>(settings);
           // Not writing a comparer just for this...
           var oldConfig = await Plugin.LoadJson<DeprecatedItemBoxTrackerConfig>(settings);
           if (oldConfig.Tracking.Count > 0) {
-            config.Always.Tracking = new ObservableCollection<ItemConfig>(oldConfig.Tracking);
+            config.Always.Tracking = new ObservableCollection<ItemModel>(oldConfig.Tracking);
             await Plugin.SaveJson(settings, config);
             Plugin.Log("Converted settings file to the new format");
           }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
index d43d160..d0c07d7 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
@@ -34,7 +34,7 @@ public void loadItemBox(object source = null, EventArgs e = null) {
 
         var itemsHeld = box.FindItemsInBox(ids);
         var itemBoxRows = new List<Views.ItemBoxRow>();
-        foreach (ItemConfig item in items) {
+        foreach (ItemModel item in items) {
           itemsHeld.TryGetValue(item.ItemId, out int amountHeld);
 
           itemBoxRows.Add(new Views.ItemBoxRow {
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
index 59ebb6b..7d44de7 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/ItemViewModel.cs
@@ -5,30 +5,30 @@
 
 namespace MHWItemBoxTracker.ViewModel {
   public class ItemViewModel : SearchableViewModel {
-    private ObservableCollection<ItemConfig> currentlySelected;
-    public ObservableCollection<ItemConfig> CurrentlySelected {
+    private ObservableCollection<ItemModel> currentlySelected;
+    public ObservableCollection<ItemModel> CurrentlySelected {
       get => currentlySelected;
       set {
         SetField(ref currentlySelected, value);
       }
     }
-    public ItemViewModel(ItemConfig Data) : base(Data) { }
+    public ItemViewModel(ItemModel Data) : base(Data) { }
 
     public override void SuggestionChosen() {
-      var data = Data as ItemConfig;
-      var selectedItem = SuggestionsView.CurrentItem as ItemConfig;
+      var data = Data as ItemModel;
+      var selectedItem = SuggestionsView.CurrentItem as ItemModel;
       data.ItemId = selectedItem.ItemId;
       data.Name = selectedItem.Name;
     }
 
     public override bool SuggestionsFilter(object Candidate) {
-      var candidate = Candidate as ItemConfig;
+      var candidate = Candidate as ItemModel;
       return CultureInfo.CurrentCulture.CompareInfo.IndexOf(candidate.Name, SearchQuery, CompareOptions.IgnoreCase) >= 0
           && !CurrentlySelected.Contains(candidate);
     }
 
     public override void ClearSelection() {
-      var data = Data as ItemConfig;
+      var data = Data as ItemModel;
       data.ItemId = 0;
     }
   }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
index d276831..33d57c3 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
@@ -13,9 +13,9 @@ public class SettingsViewModel : NotifyPropertyChanged {
     private TrackingTabViewModel always;
     private TrackingTabViewModel village;
     private TrackingTabViewModel quest;
-    private ObservableCollection<ItemConfig> items = new();
+    private ObservableCollection<ItemModel> items = new();
 
-    public SettingsViewModel(ItemBoxTrackerConfig Config) {
+    public SettingsViewModel(SettingsModel Config) {
       this.Config = Config;
       LoadItems = new ArglessRelayCommand(LoadItemsFromGMD);
 
@@ -29,14 +29,14 @@ public SettingsViewModel(ItemBoxTrackerConfig Config) {
         Items = Items
       };
     }
-    public ItemBoxTrackerConfig Config { get; }
+    public SettingsModel Config { get; }
     public ICommand LoadItems { get; }
 
     private void LoadItemsFromGMD() {
       if (GMD.Items.gValuesOffsets != null) {
-        var items = new ObservableCollection<ItemConfig>(Enumerable
+        var items = new ObservableCollection<ItemModel>(Enumerable
           .Range(0, GMD.Items.gValuesOffsets.Length / 2)
-          .Select(id => new ItemConfig {
+          .Select(id => new ItemModel {
             ItemId = id,
             Name = GMD.GetItemNameById(id)
           })
@@ -66,7 +66,7 @@ public TrackingTabViewModel Quest {
       set => SetField(ref quest, value);
     }
 
-    public ObservableCollection<ItemConfig> Items {
+    public ObservableCollection<ItemModel> Items {
       get => items;
       set => SetField(ref items, value);
     }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
index c9fa174..41406d7 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/TrackingTabViewModel.cs
@@ -6,44 +6,44 @@
 
 namespace MHWItemBoxTracker.ViewModel {
   public class TrackingTabViewModel : NotifyPropertyChanged {
-    public TrackingTabConfig Model { get; }
+    public TrackingTabModel Model { get; }
     public ICommand AddRow { get; }
     public ICommand DeleteRow { get; }
     public ICommand MoveUp { get; }
     public ICommand MoveDown { get; }
-    private ObservableCollection<ItemConfig> items;
+    private ObservableCollection<ItemModel> items;
 
-    public TrackingTabViewModel(TrackingTabConfig Model) {
+    public TrackingTabViewModel(TrackingTabModel Model) {
       this.Model = Model;
       if (Model.Tracking.Count == 0) {
         Model.Tracking.Add(new());
       }
 
       AddRow = new ArglessRelayCommand(() => Model.Tracking.Add(new()));
-      DeleteRow = new RelayCommand(item => deleteRow(item as ItemConfig));
-      MoveUp = new RelayCommand(item => moveUp(item as ItemConfig));
-      MoveDown = new RelayCommand(item => moveDown(item as ItemConfig));
+      DeleteRow = new RelayCommand(item => deleteRow(item as ItemModel));
+      MoveUp = new RelayCommand(item => moveUp(item as ItemModel));
+      MoveDown = new RelayCommand(item => moveDown(item as ItemModel));
     }
 
-    public ObservableCollection<ItemConfig> Items {
+    public ObservableCollection<ItemModel> Items {
       get => items;
       set => SetField(ref items, value);
     }
 
-    private void deleteRow(ItemConfig item) {
+    private void deleteRow(ItemModel item) {
       Model.Tracking.Remove(item);
       if (Model.Tracking.Count == 0) {
         Model.Tracking.Add(new());
       }
     }
-    private void moveUp(ItemConfig item) {
+    private void moveUp(ItemModel item) {
       var index = Model.Tracking.IndexOf(item);
       if (index > 0) {
         Model.Tracking.Move(index, index - 1);
       }
     }
 
-    private void moveDown(ItemConfig item) {
+    private void moveDown(ItemModel item) {
       var index = Model.Tracking.IndexOf(item);
       if (index < Model.Tracking.Count - 1) {
         Model.Tracking.Move(index, index + 1);
diff --git a/scripts/gen-settings-json.csx b/scripts/gen-settings-json.csx
index aba0d66..7a8c567 100644
--- a/scripts/gen-settings-json.csx
+++ b/scripts/gen-settings-json.csx
@@ -13,6 +13,6 @@ if (Args.Count > 0) {
 
 var releaseDirectory = $"ItemBoxTracker/bin/{configuration}";
 
-var settings = new ItemBoxTrackerConfig();
+var settings = new SettingsModel();
 var json = JsonConvert.SerializeObject(settings, Formatting.Indented);
 File.WriteAllText($"{releaseDirectory}/{ConfigService.settings}", json);

From cbe8f95636e1b16ae9cffa4b6a5db00d273b6e52 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Fri, 14 May 2021 00:33:50 -0400
Subject: [PATCH 10/14] refactor(overlay): add Inventory models and viewmodel

---
 .../src/Plugin/Model/InventoryItemModel.cs    | 55 +++++++++++++++++++
 .../src/Plugin/Model/InventoryModel.cs        | 25 +++++++++
 .../Plugin/ViewModel/InventoryViewModel.cs    | 29 ++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
 create mode 100644 ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
 create mode 100644 ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs

diff --git a/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs b/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
new file mode 100644
index 0000000..3ac1412
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
@@ -0,0 +1,55 @@
+using MHWItemBoxTracker.Utils;
+
+namespace MHWItemBoxTracker.Model {
+  public class InventoryItemModel : NotifyPropertyChanged {
+    private ItemModel item = new();
+    private int amountInBox;
+    private int amountInPouch;
+    private int amountCraftable;
+    public bool trackInVillage;
+    public bool trackInQuest;
+    public bool trackCraftable;
+
+    public ItemModel Item {
+      get => item;
+      set => SetField(ref item, value);
+    }
+
+    public int AmountInBox {
+      get => amountInBox;
+      set => SetField(ref amountInBox, value);
+    }
+    public int AmountInPouch {
+      get => amountInPouch;
+      set => SetField(ref amountInPouch, value);
+    }
+    public int AmountCraftable {
+      get => amountCraftable;
+      set => SetField(ref amountCraftable, value);
+    }
+    public bool TrackInVillage {
+      get => trackInVillage;
+      set => SetField(ref trackInVillage, value);
+    }
+    public bool TrackInQuest {
+      get => trackInQuest;
+      set => SetField(ref trackInQuest, value);
+    }
+    public bool TrackCraftable {
+      get => trackCraftable;
+      set => SetField(ref trackCraftable, value);
+    }
+
+    public override bool Equals(object obj) {
+      if ((obj != null) && GetType().Equals(obj.GetType())) {
+        var Obj = (InventoryItemModel)obj;
+        return Obj.Item.ItemId == Item.ItemId;
+      }
+      return false;
+    }
+
+    public override int GetHashCode() {
+      return Item.ItemId;
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs b/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
new file mode 100644
index 0000000..4db5ad3
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
@@ -0,0 +1,25 @@
+using System.Collections.ObjectModel;
+using MHWItemBoxTracker.Utils;
+
+namespace MHWItemBoxTracker.Model {
+  public class InventoryModel : NotifyPropertyChanged {
+    private bool inVillage = false;
+    public bool inQuest = false;
+    public ObservableCollection<InventoryItemModel> items = new();
+
+    public bool InVillage {
+      get => inVillage;
+      set => SetField(ref inVillage, value);
+    }
+
+    public bool InQuest {
+      get => inQuest;
+      set => SetField(ref inQuest, value);
+    }
+
+    public ObservableCollection<InventoryItemModel> Items {
+      get => items;
+      set => SetField(ref items, value);
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs
new file mode 100644
index 0000000..01de49e
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs
@@ -0,0 +1,29 @@
+
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Data;
+using MHWItemBoxTracker.Model;
+using MHWItemBoxTracker.Utils;
+
+namespace MHWItemBoxTracker.ViewModel {
+  public class InventoryViewModel : NotifyPropertyChanged {
+    public InventoryModel Data { get; }
+    private ICollectionView items;
+
+    public InventoryViewModel(InventoryModel Data) {
+      this.Data = Data;
+      Items = CollectionViewSource.GetDefaultView(Data.Items);
+    }
+    public bool InventoryFilter(InventoryItemModel _) {
+      return true;
+    }
+
+    public ICollectionView Items {
+      get => items;
+      set {
+        SetField(ref items, value);
+        Items.Filter = candidate => InventoryFilter(candidate as InventoryItemModel);
+      }
+    }
+  }
+}

From b567e0004b77adbddafb2fac8605ec82996a08b9 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Fri, 14 May 2021 02:59:55 -0400
Subject: [PATCH 11/14] refactor(overlay): add and use InventoryService and
 InventoryView

---
 .../src/Plugin/Converter/ItemToViewModel.cs   | 15 +--
 .../src/Plugin/Converter/RatioToPercent.cs    | 10 ++
 .../Plugin/GUI/InventoryItemDataTemplate.xaml | 48 +++++++++
 ItemBoxTracker/src/Plugin/Main.cs             | 32 +++---
 .../src/Plugin/Model/InventoryItemModel.cs    | 12 +--
 .../src/Plugin/Service/InventoryService.cs    | 99 +++++++++++++++++++
 .../src/Plugin/ViewModel/ItemBoxTracker.cs    | 60 -----------
 .../src/Plugin/ViewModel/SettingsViewModel.cs |  2 -
 .../src/Plugin/Views/InventoryView.xaml       | 25 +++++
 .../src/Plugin/Views/InventoryView.xaml.cs    | 49 +++++++++
 .../src/Plugin/Views/ItemBoxTracker.xaml      | 57 -----------
 .../src/Plugin/Views/ItemBoxTracker.xaml.cs   | 46 ---------
 .../src/Plugin/Views/SettingsView.xaml.cs     |  1 +
 .../src/Plugin/Views/TrackingTabView.xaml.cs  |  1 +
 .../Converter/GenericMultiValueConverter.cs   | 21 ++++
 15 files changed, 279 insertions(+), 199 deletions(-)
 create mode 100644 ItemBoxTracker/src/Plugin/Converter/RatioToPercent.cs
 create mode 100644 ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
 create mode 100644 ItemBoxTracker/src/Plugin/Service/InventoryService.cs
 delete mode 100644 ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
 create mode 100644 ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
 create mode 100644 ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
 delete mode 100644 ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
 delete mode 100644 ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
 create mode 100644 ItemBoxTracker/src/Shareables/Converter/GenericMultiValueConverter.cs

diff --git a/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
index 3e49250..b939ffc 100644
--- a/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/Converter/ItemToViewModel.cs
@@ -1,14 +1,11 @@
-using System;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Windows.Data;
-using System.Windows.Markup;
 using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.ViewModel;
 
 namespace MHWItemBoxTracker.Converter {
-  public class ItemToViewModel : MarkupExtension, IMultiValueConverter {
-    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+  public class ItemToViewModel : GenericMultiValueConverter<ItemViewModel> {
+    public override ItemViewModel Convert(object[] values) {
       var item = values[0] as ItemModel;
       var suggestions = values[1] as ObservableCollection<ItemModel>;
       var currentlySelected = values[2] as ObservableCollection<ItemModel>;
@@ -18,13 +15,5 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
         CurrentlySelected = currentlySelected
       };
     }
-
-    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) {
-      throw new NotImplementedException();
-    }
-
-    public override object ProvideValue(IServiceProvider serviceProvider) {
-      return this;
-    }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/Converter/RatioToPercent.cs b/ItemBoxTracker/src/Plugin/Converter/RatioToPercent.cs
new file mode 100644
index 0000000..e607a8b
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Converter/RatioToPercent.cs
@@ -0,0 +1,10 @@
+namespace MHWItemBoxTracker.Converter {
+  public class RatioToPercent : GenericMultiValueConverter<double> {
+    public override double Convert(object[] values) {
+      var num = (int)values[0];
+      var den = (int)values[1];
+
+      return num * 100f / den;
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml b/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
new file mode 100644
index 0000000..8075c2e
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
@@ -0,0 +1,48 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:data="clr-namespace:MHWItemBoxTracker.Model"
+    xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter">
+  <DataTemplate DataType="{x:Type data:InventoryItemModel}">
+    <Grid Margin="0,2">
+      <!--<Image />-->
+      <TextBlock
+          Grid.Column="0"
+          Text="{Binding Item.Name}"
+          FontSize="14"
+          HorizontalAlignment="Left"
+          Padding="0,0,10,0" />
+      <TextBlock
+          Grid.Column="1"
+          FontSize="14"
+          HorizontalAlignment="Right"
+          Padding="0,0,10,0">
+        <TextBlock.Text>
+          <MultiBinding StringFormat="{}{0}/{1}">
+            <Binding Path="AmountInBox" />
+            <Binding Path="Item.Amount" />
+          </MultiBinding>
+        </TextBlock.Text>
+      </TextBlock>
+      <ProgressBar
+          Grid.Column="2"
+          Minimum="0"
+          Maximum="100">
+        <ProgressBar.Value>
+          <MultiBinding Converter="{convert:RatioToPercent}">
+            <Binding Path="AmountInBox" />
+            <Binding Path="Item.Amount" />
+          </MultiBinding>
+        </ProgressBar.Value>
+      </ProgressBar>
+      <!--<Custom:MinimalHealthBar Style="{StaticResource OVERLAY_MONSTER_PART_BAR_STYLE}" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Top" />-->
+
+      <Grid.ColumnDefinitions>
+        <!--<ColumnDefinition Width="50" />-->
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="75" />
+        <ColumnDefinition Width="100" />
+      </Grid.ColumnDefinitions>
+    </Grid>
+  </DataTemplate>
+</ResourceDictionary>
diff --git a/ItemBoxTracker/src/Plugin/Main.cs b/ItemBoxTracker/src/Plugin/Main.cs
index 3b6c41e..95344a3 100644
--- a/ItemBoxTracker/src/Plugin/Main.cs
+++ b/ItemBoxTracker/src/Plugin/Main.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using HunterPie.Core;
+using HunterPie.GUI;
 using HunterPie.Plugins;
 using HunterPie.Settings;
 using MHWItemBoxTracker.Service;
+using MHWItemBoxTracker.Utils;
 using MHWItemBoxTracker.Views;
 
 namespace MHWItemBoxTracker {
@@ -11,8 +13,9 @@ public class Main : IPlugin, ISettingsOwner {
     public string Description { get; set; } = "A HunterPie plugin to track items the player is farming";
     public Game Context { get; set; }
 
-    private ConfigService Config = new();
-    private Controller.ItemBoxTracker tracker { get; set; }
+    private readonly ConfigService Config = new();
+    private InventoryService Inventory;
+    private InventoryView GUI;
 
     // Really bad singleton, but I think it's fine considering
     // the plugin gets instantiated by HunterPie
@@ -27,22 +30,21 @@ public Main() {
 
     public void Initialize(Game context) {
       Context = context;
-      tracker = new Controller.ItemBoxTracker(context.Player, Config);
-
-      var player = Context.Player;
-      player.OnVillageEnter += tracker.loadItemBox;
-      player.OnVillageLeave += tracker.unloadItemBox;
-      player.ItemBox.OnItemBoxUpdate += tracker.loadItemBox;
+      Inventory = new(Context, Config);
+
+      Dispatcher.Dispatch(async () => {
+        GUI = new(Inventory);
+        Overlay.RegisterWidget(GUI);
+        await GUI.Initialize();
+        Inventory.Subscribe();
+      });
     }
 
     public void Unload() {
-      var player = Context.Player;
-      player.OnVillageEnter -= tracker.loadItemBox;
-      player.OnVillageLeave -= tracker.unloadItemBox;
-      player.ItemBox.OnItemBoxUpdate -= tracker.loadItemBox;
-
-      tracker.unloadItemBox();
-      tracker.unregister();
+      Inventory.Unsubscribe();
+      Dispatcher.Dispatch(() => {
+        Overlay.UnregisterWidget(GUI);
+      });
     }
 
     public IEnumerable<ISettingsTab> GetSettings(ISettingsBuilder builder) {
diff --git a/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs b/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
index 3ac1412..ff2077e 100644
--- a/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
+++ b/ItemBoxTracker/src/Plugin/Model/InventoryItemModel.cs
@@ -3,12 +3,12 @@
 namespace MHWItemBoxTracker.Model {
   public class InventoryItemModel : NotifyPropertyChanged {
     private ItemModel item = new();
-    private int amountInBox;
-    private int amountInPouch;
-    private int amountCraftable;
-    public bool trackInVillage;
-    public bool trackInQuest;
-    public bool trackCraftable;
+    private int amountInBox = 0;
+    private int amountInPouch = 0;
+    private int amountCraftable = 0;
+    public bool trackInVillage = false;
+    public bool trackInQuest = false;
+    public bool trackCraftable = false;
 
     public ItemModel Item {
       get => item;
diff --git a/ItemBoxTracker/src/Plugin/Service/InventoryService.cs b/ItemBoxTracker/src/Plugin/Service/InventoryService.cs
new file mode 100644
index 0000000..d9778b9
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Service/InventoryService.cs
@@ -0,0 +1,99 @@
+
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HunterPie.Core;
+using HunterPie.Plugins;
+using MHWItemBoxTracker.Model;
+using static MHWItemBoxTracker.Main;
+
+namespace MHWItemBoxTracker.Service {
+  public class InventoryService {
+    // TODO: Probably need this
+    private static readonly SemaphoreSlim locke = new(1, 1);
+    private Game Context;
+    private ConfigService Config;
+    private SettingsModel Settings;
+    private InventoryModel Data;
+
+    public InventoryService(Game Context, ConfigService Config) {
+      this.Context = Context;
+      this.Config = Config;
+    }
+
+    public async Task<InventoryModel> LoadAsync() {
+      if (Data == null) {
+        Settings = await Config.LoadAsync();
+        Data = new() {
+          InVillage = Context.Player.InHarvestZone,
+        };
+      }
+      Refresh();
+      return Data;
+    }
+
+    public void Refresh(object source = null, EventArgs e = null) {
+      var always = Settings.Always.Tracking.Select(i => new InventoryItemModel() {
+        Item = i,
+        TrackInVillage = true,
+        TrackInQuest = true,
+        TrackCraftable = Settings.Always.TrackCraftable,
+      });
+      var village = Settings.Village.Tracking.Select(i => new InventoryItemModel() {
+        Item = i,
+        TrackInVillage = true,
+        TrackCraftable = Settings.Village.TrackCraftable,
+      });
+      var quest = Settings.Quest.Tracking.Select(i => new InventoryItemModel() {
+        Item = i,
+        TrackInQuest = true,
+        TrackCraftable = Settings.Quest.TrackCraftable,
+      });
+
+      var itemsInSettings = always.Union(village).Union(quest);
+
+      var remove = Data.Items.Except(itemsInSettings);
+      var add = itemsInSettings.Except(Data.Items);
+
+      foreach (var item in remove) {
+        Data.Items.Remove(item);
+      }
+      foreach (var item in add) {
+        Data.Items.Add(item);
+      }
+      var ids = Data.Items.Select(i => i.Item.ItemId).ToHashSet();
+      var box = Context.Player.ItemBox?.FindItemsInBox(ids) ?? new();
+      foreach (var item in Data.Items) {
+        box.TryGetValue(item.Item.ItemId, out int amountInBox);
+        item.AmountInBox = amountInBox;
+      }
+    }
+
+    public void Subscribe() {
+      var player = Context.Player;
+      player.OnVillageEnter += EnterVillage;
+      player.OnVillageLeave += LeaveVillage;
+      player.ItemBox.OnItemBoxUpdate += Refresh;
+      // TODO: subscribe to save event?
+    }
+
+    public void Unsubscribe() {
+      var player = Context.Player;
+      player.OnVillageEnter -= EnterVillage;
+      player.OnVillageLeave -= LeaveVillage;
+      player.ItemBox.OnItemBoxUpdate -= Refresh;
+    }
+
+    private void EnterVillage(object source = null, EventArgs e = null) {
+      Data.InVillage = true;
+      Refresh();
+    }
+
+    private void LeaveVillage(object source = null, EventArgs e = null) {
+      Data.InVillage = false;
+      Refresh();
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs b/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
deleted file mode 100644
index d0c07d7..0000000
--- a/ItemBoxTracker/src/Plugin/ViewModel/ItemBoxTracker.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using HunterPie.Core;
-using HunterPie.GUI;
-using MHWItemBoxTracker.Model;
-using MHWItemBoxTracker.Service;
-using static MHWItemBoxTracker.Utils.Dispatcher;
-
-namespace MHWItemBoxTracker.Controller {
-  class ItemBoxTracker {
-    private Player player { get; }
-    private Views.ItemBoxTrackerView gui;
-
-    private ConfigService Config;
-
-    public ItemBoxTracker(Player player, ConfigService Config) {
-      this.player = player;
-      this.Config = Config;
-      Dispatch(() => {
-        gui = new();
-        Overlay.RegisterWidget(gui);
-      });
-    }
-
-    public void loadItemBox(object source = null, EventArgs e = null) {
-      if (!player.InHarvestZone) return;
-      Dispatch(async () => {
-        var config = (await Config.LoadAsync()).Always;
-
-        var items = config.Tracking;
-        var box = player.ItemBox;
-        var ids = items.Select(ic => ic.ItemId).ToHashSet();
-
-        var itemsHeld = box.FindItemsInBox(ids);
-        var itemBoxRows = new List<Views.ItemBoxRow>();
-        foreach (ItemModel item in items) {
-          itemsHeld.TryGetValue(item.ItemId, out int amountHeld);
-
-          itemBoxRows.Add(new Views.ItemBoxRow {
-            name = item.Name,
-            ratio = $"{amountHeld}/{item.Amount}",
-            progress = 100.0 * amountHeld / item.Amount,
-          });
-        }
-        gui.setItemsToDisplay(itemBoxRows);
-      });
-    }
-
-    public void unloadItemBox(object source = null, EventArgs e = null) {
-      Dispatch(() => gui.setItemsToDisplay(new List<Views.ItemBoxRow>()));
-    }
-
-    public void unregister() {
-      Dispatch(() => Overlay.UnregisterWidget(gui));
-    }
-
-
-  }
-}
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
index 33d57c3..160dd90 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/SettingsViewModel.cs
@@ -2,11 +2,9 @@
 using System.Linq;
 using System.Windows.Input;
 using HunterPie.Core.Native;
-using HunterPie.Plugins;
 using HunterPie.UI.Infrastructure;
 using MHWItemBoxTracker.Model;
 using MHWItemBoxTracker.Utils;
-using static MHWItemBoxTracker.Main;
 
 namespace MHWItemBoxTracker.ViewModel {
   public class SettingsViewModel : NotifyPropertyChanged {
diff --git a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
new file mode 100644
index 0000000..0f1caa2
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
@@ -0,0 +1,25 @@
+<src:Widget
+    x:Class="MHWItemBoxTracker.Views.InventoryView"
+    xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
+    xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    mc:Ignorable="d"
+    ResizeMode="NoResize"
+    WindowStyle="None"
+    AllowsTransparency="True"
+    ShowInTaskbar="False"
+    Topmost="True"
+    SizeToContent="Height"
+    Width="350"
+    WidgetActive="True">
+  <Window.Resources>
+    <ResourceDictionary Source="../GUI/InventoryItemDataTemplate.xaml" />
+  </Window.Resources>
+  <ListBox
+      ItemsSource="{Binding Items}"
+      HorizontalContentAlignment="Stretch"
+      IsEnabled="False" />
+</src:Widget>
diff --git a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
new file mode 100644
index 0000000..c790eef
--- /dev/null
+++ b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using HunterPie.Core.Settings;
+using HunterPie.GUI;
+using HunterPie.Plugins;
+using MHWItemBoxTracker.Model;
+using MHWItemBoxTracker.Service;
+using MHWItemBoxTracker.ViewModel;
+using static MHWItemBoxTracker.Main;
+using static MHWItemBoxTracker.Utils.Dispatcher;
+
+namespace MHWItemBoxTracker.Views {
+  public partial class InventoryView : Widget {
+    private static readonly string settingsJson = "widget.settings.json";
+    private ItemBoxWidgetSettings widgetSettings { get; set; }
+    public override IWidgetSettings Settings => widgetSettings;
+    InventoryService Inventory;
+    private InventoryViewModel VM;
+    public InventoryView(InventoryService Inventory) : base() {
+      InitializeComponent();
+      this.Inventory = Inventory;
+      VM = new(new());
+      DataContext = VM;
+    }
+
+    public async Task Initialize() {
+      widgetSettings = await Plugin.LoadJson<ItemBoxWidgetSettings>(settingsJson);
+      ApplySettings();
+
+      var data = await Inventory.LoadAsync();
+      VM = new(data);
+      DataContext = VM;
+
+      WidgetHasContent = true;
+      ChangeVisibility();
+    }
+
+    public override void EnterWidgetDesignMode() {
+      base.EnterWidgetDesignMode();
+      RemoveWindowTransparencyFlag();
+    }
+
+    public async override void LeaveWidgetDesignMode() {
+      base.LeaveWidgetDesignMode();
+      ApplyWindowTransparencyFlag();
+      await Plugin.SaveJson(settingsJson, widgetSettings);
+    }
+  }
+}
diff --git a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
deleted file mode 100644
index 5c89cec..0000000
--- a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<src:Widget
-    x:Class="MHWItemBoxTracker.Views.ItemBoxTrackerView"
-    xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
-    xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    mc:Ignorable="d"
-    ResizeMode="NoResize"
-    WindowStyle="None"
-    AllowsTransparency="True"
-    ShowInTaskbar="False"
-    Topmost="True"
-    SizeToContent="Height"
-    Width="350"
-    WidgetActive="True">
-  <Grid>
-    <ListBox
-        Name="theList"
-        HorizontalContentAlignment="Stretch"
-        IsEnabled="False">
-      <ListBox.ItemTemplate>
-        <DataTemplate>
-          <Grid Margin="0,2">
-            <!--<Image />-->
-            <TextBlock
-                Grid.Column="0"
-                Text="{Binding name}"
-                FontSize="14"
-                HorizontalAlignment="Left"
-                Padding="0,0,10,0" />
-            <TextBlock
-                Grid.Column="1"
-                Text="{Binding ratio}"
-                FontSize="14"
-                HorizontalAlignment="Right"
-                Padding="0,0,10,0" />
-            <ProgressBar
-                Grid.Column="2"
-                Minimum="0"
-                Maximum="100"
-                Value="{Binding progress}" />
-            <!--<Custom:MinimalHealthBar Style="{StaticResource OVERLAY_MONSTER_PART_BAR_STYLE}" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Top" />-->
-
-            <Grid.ColumnDefinitions>
-              <!--<ColumnDefinition Width="50" />-->
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="75" />
-              <ColumnDefinition Width="100" />
-            </Grid.ColumnDefinitions>
-          </Grid>
-        </DataTemplate>
-      </ListBox.ItemTemplate>
-    </ListBox>
-  </Grid>
-</src:Widget>
diff --git a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs b/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
deleted file mode 100644
index 6e8737f..0000000
--- a/ItemBoxTracker/src/Plugin/Views/ItemBoxTracker.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using HunterPie.Core.Settings;
-using HunterPie.GUI;
-using HunterPie.Plugins;
-using MHWItemBoxTracker.Model;
-using static MHWItemBoxTracker.Main;
-using static MHWItemBoxTracker.Utils.Dispatcher;
-
-namespace MHWItemBoxTracker.Views {
-  public partial class ItemBoxTrackerView : Widget {
-    private static readonly string settingsJson = "widget.settings.json";
-    private ItemBoxWidgetSettings widgetSettings { get; set; }
-    public override IWidgetSettings Settings => widgetSettings;
-    public ItemBoxTrackerView() : base() {
-      InitializeComponent();
-      Dispatch(async () => {
-        widgetSettings = await Plugin.LoadJson<ItemBoxWidgetSettings>(settingsJson);
-        ApplySettings();
-      });
-    }
-
-    public void setItemsToDisplay(List<ItemBoxRow> itemBoxRows) {
-      // Debugger.Log($"Theme: {UserSettings.PlayerConfig.HunterPie.Theme}");
-      theList.ItemsSource = itemBoxRows;
-      WidgetHasContent = (itemBoxRows.Count > 0);
-      ChangeVisibility();
-    }
-
-    public override void EnterWidgetDesignMode() {
-      base.EnterWidgetDesignMode();
-      RemoveWindowTransparencyFlag();
-    }
-
-    public override void LeaveWidgetDesignMode() {
-      base.LeaveWidgetDesignMode();
-      ApplyWindowTransparencyFlag();
-      Dispatch(async () => { await Plugin.SaveJson(settingsJson, widgetSettings); });
-    }
-  }
-
-  public class ItemBoxRow {
-    public string name { get; set; }
-    public string ratio { get; set; }
-    public double progress { get; set; }
-  }
-}
diff --git a/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
index 99bc04f..b46a65a 100644
--- a/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/SettingsView.xaml.cs
@@ -24,6 +24,7 @@ public async void LoadSettings() {
 
     public async void SaveSettings() {
       await Config.SaveAsync();
+      // TODO: Inventory.Refresh()
     }
 
     public string ValidateSettings() {
diff --git a/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
index eebb4b9..36950fa 100644
--- a/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows.Controls;
 
 namespace MHWItemBoxTracker.Views {
+  // TODO: Delete this somehow
   public partial class TrackingTabView : UserControl {
     public TrackingTabView() : base() {
       InitializeComponent();
diff --git a/ItemBoxTracker/src/Shareables/Converter/GenericMultiValueConverter.cs b/ItemBoxTracker/src/Shareables/Converter/GenericMultiValueConverter.cs
new file mode 100644
index 0000000..c6cf718
--- /dev/null
+++ b/ItemBoxTracker/src/Shareables/Converter/GenericMultiValueConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace MHWItemBoxTracker.Converter {
+  public abstract class GenericMultiValueConverter<T> : MarkupExtension, IMultiValueConverter {
+    public abstract T Convert(object[] values);
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+      return Convert(values);
+    }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) {
+      throw new NotImplementedException();
+    }
+
+    public override object ProvideValue(IServiceProvider serviceProvider) {
+      return this;
+    }
+  }
+}

From db37a671a7ea8668560a6e9655c9dd5abb0010ba Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Fri, 14 May 2021 03:39:54 -0400
Subject: [PATCH 12/14] refactor(overlay): bind ItemModel to widget and use
 existing data template to render it

---
 .../src/Plugin/GUI/InventoryItemDataTemplate.xaml         | 8 +++-----
 ItemBoxTracker/src/Plugin/Views/InventoryView.xaml        | 7 ++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml b/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
index 8075c2e..0b08f6f 100644
--- a/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
+++ b/ItemBoxTracker/src/Plugin/GUI/InventoryItemDataTemplate.xaml
@@ -6,12 +6,10 @@
   <DataTemplate DataType="{x:Type data:InventoryItemModel}">
     <Grid Margin="0,2">
       <!--<Image />-->
-      <TextBlock
+
+      <ContentControl
           Grid.Column="0"
-          Text="{Binding Item.Name}"
-          FontSize="14"
-          HorizontalAlignment="Left"
-          Padding="0,0,10,0" />
+          Content="{Binding Item}" />
       <TextBlock
           Grid.Column="1"
           FontSize="14"
diff --git a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
index 0f1caa2..690d568 100644
--- a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
+++ b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml
@@ -16,7 +16,12 @@
     Width="350"
     WidgetActive="True">
   <Window.Resources>
-    <ResourceDictionary Source="../GUI/InventoryItemDataTemplate.xaml" />
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../GUI/InventoryItemDataTemplate.xaml" />
+        <ResourceDictionary Source="../GUI/ItemDataTemplate.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
   </Window.Resources>
   <ListBox
       ItemsSource="{Binding Items}"

From 61ace7d6d67b8d4120d95ad0ffa4cc6932cb7e50 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Fri, 14 May 2021 15:42:42 -0400
Subject: [PATCH 13/14] feat(#26 TrackingTabs): enable tracking lists in all
 tabs by adding a filter to the list that filters based on whether InVillage
 is true

---
 ItemBoxTracker/src/Plugin/Main.cs             |  7 +++--
 .../src/Plugin/Model/InventoryModel.cs        |  6 ----
 .../src/Plugin/Service/InventoryService.cs    | 29 ++++++++++++-------
 .../Plugin/ViewModel/InventoryViewModel.cs    | 11 +++++--
 .../src/Plugin/Views/InventoryView.xaml.cs    | 20 +++++--------
 5 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/ItemBoxTracker/src/Plugin/Main.cs b/ItemBoxTracker/src/Plugin/Main.cs
index 95344a3..8db07d5 100644
--- a/ItemBoxTracker/src/Plugin/Main.cs
+++ b/ItemBoxTracker/src/Plugin/Main.cs
@@ -33,16 +33,17 @@ public void Initialize(Game context) {
       Inventory = new(Context, Config);
 
       Dispatcher.Dispatch(async () => {
-        GUI = new(Inventory);
+        GUI = new(await Inventory.LoadAsync());
+        Inventory.Subscribe();
         Overlay.RegisterWidget(GUI);
         await GUI.Initialize();
-        Inventory.Subscribe();
       });
     }
 
     public void Unload() {
-      Inventory.Unsubscribe();
       Dispatcher.Dispatch(() => {
+        Inventory.Unsubscribe();
+        GUI.Unload();
         Overlay.UnregisterWidget(GUI);
       });
     }
diff --git a/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs b/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
index 4db5ad3..d0f459b 100644
--- a/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
+++ b/ItemBoxTracker/src/Plugin/Model/InventoryModel.cs
@@ -4,7 +4,6 @@
 namespace MHWItemBoxTracker.Model {
   public class InventoryModel : NotifyPropertyChanged {
     private bool inVillage = false;
-    public bool inQuest = false;
     public ObservableCollection<InventoryItemModel> items = new();
 
     public bool InVillage {
@@ -12,11 +11,6 @@ public bool InVillage {
       set => SetField(ref inVillage, value);
     }
 
-    public bool InQuest {
-      get => inQuest;
-      set => SetField(ref inQuest, value);
-    }
-
     public ObservableCollection<InventoryItemModel> Items {
       get => items;
       set => SetField(ref items, value);
diff --git a/ItemBoxTracker/src/Plugin/Service/InventoryService.cs b/ItemBoxTracker/src/Plugin/Service/InventoryService.cs
index d9778b9..2508326 100644
--- a/ItemBoxTracker/src/Plugin/Service/InventoryService.cs
+++ b/ItemBoxTracker/src/Plugin/Service/InventoryService.cs
@@ -1,18 +1,16 @@
 
 using System;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using HunterPie.Core;
-using HunterPie.Plugins;
 using MHWItemBoxTracker.Model;
-using static MHWItemBoxTracker.Main;
+using MHWItemBoxTracker.Utils;
 
 namespace MHWItemBoxTracker.Service {
   public class InventoryService {
     // TODO: Probably need this
-    private static readonly SemaphoreSlim locke = new(1, 1);
+    // private static readonly SemaphoreSlim locke = new(1, 1);
     private Game Context;
     private ConfigService Config;
     private SettingsModel Settings;
@@ -34,7 +32,7 @@ public async Task<InventoryModel> LoadAsync() {
       return Data;
     }
 
-    public void Refresh(object source = null, EventArgs e = null) {
+    public void Refresh() {
       var always = Settings.Always.Tracking.Select(i => new InventoryItemModel() {
         Item = i,
         TrackInVillage = true,
@@ -71,6 +69,7 @@ public void Refresh(object source = null, EventArgs e = null) {
       }
     }
 
+    // TODO: Probably move these to an event handler class or something
     public void Subscribe() {
       var player = Context.Player;
       player.OnVillageEnter += EnterVillage;
@@ -86,14 +85,22 @@ public void Unsubscribe() {
       player.ItemBox.OnItemBoxUpdate -= Refresh;
     }
 
-    private void EnterVillage(object source = null, EventArgs e = null) {
-      Data.InVillage = true;
-      Refresh();
+    public void Refresh(object source, EventArgs e) {
+      Dispatcher.Dispatch(Refresh);
     }
 
-    private void LeaveVillage(object source = null, EventArgs e = null) {
-      Data.InVillage = false;
-      Refresh();
+    private void EnterVillage(object source, EventArgs e) {
+      Dispatcher.Dispatch(() => {
+        Data.InVillage = true;
+        Refresh();
+      });
+    }
+
+    private void LeaveVillage(object source, EventArgs e) {
+      Dispatcher.Dispatch(() => {
+        Data.InVillage = false;
+        Refresh();
+      });
     }
   }
 }
diff --git a/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs b/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs
index 01de49e..0391eb2 100644
--- a/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs
+++ b/ItemBoxTracker/src/Plugin/ViewModel/InventoryViewModel.cs
@@ -1,5 +1,4 @@
 
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows.Data;
 using MHWItemBoxTracker.Model;
@@ -13,9 +12,15 @@ public class InventoryViewModel : NotifyPropertyChanged {
     public InventoryViewModel(InventoryModel Data) {
       this.Data = Data;
       Items = CollectionViewSource.GetDefaultView(Data.Items);
+      Data.PropertyChanged += (sender, e) => {
+        if (e.PropertyName == nameof(Data.InVillage)) {
+          Items?.Refresh();
+        }
+      };
     }
-    public bool InventoryFilter(InventoryItemModel _) {
-      return true;
+    public bool InventoryFilter(InventoryItemModel candidate) {
+      return (candidate.TrackInVillage && Data.InVillage)
+      || (candidate.TrackInQuest && !Data.InVillage);
     }
 
     public ICollectionView Items {
diff --git a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
index c790eef..bf55a9b 100644
--- a/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
+++ b/ItemBoxTracker/src/Plugin/Views/InventoryView.xaml.cs
@@ -1,25 +1,20 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using HunterPie.Core.Settings;
 using HunterPie.GUI;
 using HunterPie.Plugins;
 using MHWItemBoxTracker.Model;
-using MHWItemBoxTracker.Service;
 using MHWItemBoxTracker.ViewModel;
 using static MHWItemBoxTracker.Main;
-using static MHWItemBoxTracker.Utils.Dispatcher;
 
 namespace MHWItemBoxTracker.Views {
   public partial class InventoryView : Widget {
     private static readonly string settingsJson = "widget.settings.json";
     private ItemBoxWidgetSettings widgetSettings { get; set; }
     public override IWidgetSettings Settings => widgetSettings;
-    InventoryService Inventory;
     private InventoryViewModel VM;
-    public InventoryView(InventoryService Inventory) : base() {
+    public InventoryView(InventoryModel Inventory) : base() {
       InitializeComponent();
-      this.Inventory = Inventory;
-      VM = new(new());
+      VM = new(Inventory);
       DataContext = VM;
     }
 
@@ -27,14 +22,15 @@ public async Task Initialize() {
       widgetSettings = await Plugin.LoadJson<ItemBoxWidgetSettings>(settingsJson);
       ApplySettings();
 
-      var data = await Inventory.LoadAsync();
-      VM = new(data);
-      DataContext = VM;
-
       WidgetHasContent = true;
       ChangeVisibility();
     }
 
+    public void Unload() {
+      WidgetHasContent = false;
+      ChangeVisibility();
+    }
+
     public override void EnterWidgetDesignMode() {
       base.EnterWidgetDesignMode();
       RemoveWindowTransparencyFlag();

From 924e91f3bf2a7901c42f8e611cedda528bab1233 Mon Sep 17 00:00:00 2001
From: SupaStuff <Stuff_Git_NaoResposta@outlook.com>
Date: Fri, 14 May 2021 16:05:11 -0400
Subject: [PATCH 14/14] refactor(csx): add missing dependency to module.json
 generator and rename releaseDirectory to buildDirectory

---
 scripts/gen-module-json.csx   | 7 ++++---
 scripts/gen-settings-json.csx | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/gen-module-json.csx b/scripts/gen-module-json.csx
index dda4c73..32b7aa3 100644
--- a/scripts/gen-module-json.csx
+++ b/scripts/gen-module-json.csx
@@ -15,9 +15,10 @@ if (Args.Count > 0) {
   configuration = Args[0];
 }
 
-var releaseDirectory = $"ItemBoxTracker/bin/{configuration}";
+var buildDirectory = $"ItemBoxTracker/bin/{configuration}";
 var files = new List<string>() {
     "ItemBoxTracker.dll",
+    "Microsoft.Xaml.Behaviors.dll",
 };
 
 var main = new Main();
@@ -41,7 +42,7 @@ update.FileHashes = hashes;
 
 using (var sha = SHA256.Create()) {
   foreach (string file in files) {
-    var stream = File.Open($"{releaseDirectory}/{file}", FileMode.Open);
+    var stream = File.Open($"{buildDirectory}/{file}", FileMode.Open);
     stream.Position = 0;
 
     var hashBytes = sha.ComputeHash(stream);
@@ -54,4 +55,4 @@ using (var sha = SHA256.Create()) {
 hashes.Add(ConfigService.settings, "InstallOnly");
 
 var json = JsonConvert.SerializeObject(info, Formatting.Indented);
-File.WriteAllText($"{releaseDirectory}/module.json", json);
+File.WriteAllText($"{buildDirectory}/module.json", json);
diff --git a/scripts/gen-settings-json.csx b/scripts/gen-settings-json.csx
index 7a8c567..63cafb1 100644
--- a/scripts/gen-settings-json.csx
+++ b/scripts/gen-settings-json.csx
@@ -11,8 +11,8 @@ if (Args.Count > 0) {
   configuration = Args[0];
 }
 
-var releaseDirectory = $"ItemBoxTracker/bin/{configuration}";
+var buildDirectory = $"ItemBoxTracker/bin/{configuration}";
 
 var settings = new SettingsModel();
 var json = JsonConvert.SerializeObject(settings, Formatting.Indented);
-File.WriteAllText($"{releaseDirectory}/{ConfigService.settings}", json);
+File.WriteAllText($"{buildDirectory}/{ConfigService.settings}", json);