UI - Made module tabs uppercase since that's what we do

Modules - Finished module ordering

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs

@@ -1,54 +1,84 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
+using GongSolutions.Wpf.DragDrop;
 using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Tabs.Modules
 {
-    public class ModuleOrderTabViewModel : Screen
+    public class ModuleOrderTabViewModel : Screen, IDropTarget
     {
         private readonly IPluginService _pluginService;
+        private readonly IModuleService _moduleService;
+        private List<ModuleOrderModuleViewModel> _modules;
+        private DefaultDropHandler _defaultDropHandler;
 
         public ModuleOrderTabViewModel(IPluginService pluginService, IModuleService moduleService)
         {
             DisplayName = "MODULE PRIORITY";
 
             _pluginService = pluginService;
-            NormalModules = new BindableCollection<Core.Plugins.Modules.Module>();
-            ApplicationModules = new BindableCollection<Core.Plugins.Modules.Module>();
-            OverlayModules = new BindableCollection<Core.Plugins.Modules.Module>();
+            _moduleService = moduleService;
+            _modules = new List<ModuleOrderModuleViewModel>(pluginService.GetPluginsOfType<Module>().Select(m => new ModuleOrderModuleViewModel(m)));
+            _defaultDropHandler = new DefaultDropHandler();
 
-            ModulesDropHandler = new ModulesDropHandler(moduleService, NormalModules, ApplicationModules, OverlayModules);
+            NormalModules = new BindableCollection<ModuleOrderModuleViewModel>();
+            ApplicationModules = new BindableCollection<ModuleOrderModuleViewModel>();
+            OverlayModules = new BindableCollection<ModuleOrderModuleViewModel>();
+
+            Update();
         }
 
-        public BindableCollection<Core.Plugins.Modules.Module> NormalModules { get; set; }
-        public BindableCollection<Core.Plugins.Modules.Module> ApplicationModules { get; set; }
-        public BindableCollection<Core.Plugins.Modules.Module> OverlayModules { get; set; }
+        public BindableCollection<ModuleOrderModuleViewModel> NormalModules { get; set; }
+        public BindableCollection<ModuleOrderModuleViewModel> ApplicationModules { get; set; }
+        public BindableCollection<ModuleOrderModuleViewModel> OverlayModules { get; set; }
 
-        public ModulesDropHandler ModulesDropHandler { get; }
-
-
-        protected override void OnActivate()
+        public void DragOver(IDropInfo dropInfo)
         {
-            // Take it off the UI thread to avoid freezing on tab change
-            Task.Run(() =>
-            {
-                NormalModules.Clear();
-                ApplicationModules.Clear();
-                OverlayModules.Clear();
+            _defaultDropHandler.DragOver(dropInfo);
+        }
 
-                var instances = _pluginService.GetPluginsOfType<Core.Plugins.Modules.Module>().ToList();
-                foreach (var module in instances)
-                {
-                    if (module.PriorityCategory == ModulePriorityCategory.Normal)
-                        NormalModules.Add(module);
-                    else if (module.PriorityCategory == ModulePriorityCategory.Application)
-                        ApplicationModules.Add(module);
-                    else if (module.PriorityCategory == ModulePriorityCategory.Overlay)
-                        OverlayModules.Add(module);
-                }
-            });
+        public void Drop(IDropInfo dropInfo)
+        {
+            if (dropInfo.TargetItem == dropInfo.Data)
+                return;
+
+            var viewModel = (ModuleOrderModuleViewModel) dropInfo.Data;
+            var targetCollection = (BindableCollection<ModuleOrderModuleViewModel>) dropInfo.TargetCollection;
+            var insertIndex = dropInfo.InsertIndex;
+
+            ModulePriorityCategory category;
+            if (targetCollection == NormalModules)
+                category = ModulePriorityCategory.Normal;
+            else if (targetCollection == ApplicationModules)
+                category = ModulePriorityCategory.Application;
+            else
+                category = ModulePriorityCategory.Overlay;
+
+            // If moving down, take the removal of ourselves into consideration with the insert index
+            if (targetCollection.Contains(viewModel) && targetCollection.IndexOf(viewModel) < insertIndex)
+                insertIndex--;
+
+            _moduleService.UpdateModulePriority(viewModel.Module, category, insertIndex);
+
+            Update();
+        }
+
+        public void Update()
+        {
+            NormalModules.Clear();
+            NormalModules.AddRange(_modules.Where(m => m.Module.PriorityCategory == ModulePriorityCategory.Normal).OrderBy(m => m.Module.Priority));
+
+            ApplicationModules.Clear();
+            ApplicationModules.AddRange(_modules.Where(m => m.Module.PriorityCategory == ModulePriorityCategory.Application).OrderBy(m => m.Module.Priority));
+
+            OverlayModules.Clear();
+            OverlayModules.AddRange(_modules.Where(m => m.Module.PriorityCategory == ModulePriorityCategory.Overlay).OrderBy(m => m.Module.Priority));
+
+            foreach (var moduleOrderModuleViewModel in _modules)
+                moduleOrderModuleViewModel.Update();
         }
     }
 }