Simplified factory usage

Made clip model immutable from outside
Possibly fixed a bug where is clip is created multiple times when added from clipboard

Author: Filipsi

ClipboardMachinery/ClipboardMachinery.Core/DataStorage/Impl/ClipLazyProvider.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Threading.Tasks;
 using ClipboardMachinery.Core.DataStorage.Schema;
 using ServiceStack.OrmLite;
@@ -48,6 +49,7 @@ protected override Task OnQueryBuildingStarts(SqlExpression<Clip> query) {
         }
 
         protected override Task OnQueryOrdering(SqlExpression<Clip> query) {
+            // Order clips by ID column
             query.OrderByDescending(clip => clip.Id);
             return Task.CompletedTask;
         }
@@ -56,12 +58,7 @@ protected override async Task OnBatchLoaded(IDbConnection db, List<Clip> batch)
             await base.OnBatchLoaded(db, batch);
 
             // Go thought every single clip in the batch
-            foreach (Clip clip in batch) {
-                // Skip empty tags
-                if (clip.Tags == null) {
-                    continue;
-                }
-
+            foreach (Clip clip in batch.Where(clip => clip.Tags != null)) {
                 // Load nested references for clip tags
                 foreach (Tag tag in clip.Tags) {
                     await db.LoadReferencesAsync(tag);

ClipboardMachinery/ClipboardMachinery/ClipboardMachinery.csproj

@@ -195,10 +195,8 @@
       <DependentUpon>TagTypesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\TagTypes\TagTypesViewModel.cs" />
-    <Compile Include="Plumbing\Factories\IClipFactory.cs" />
     <Compile Include="Plumbing\Factories\ITagKindFactory.cs" />
-    <Compile Include="Plumbing\Factories\IViewModelFactory.cs" />
-    <Compile Include="Plumbing\Factories\IColorGalleryFactory.cs" />
+    <Compile Include="Plumbing\Factories\IClipFactory.cs" />
     <Compile Include="Plumbing\Factories\IDialogOverlayFactory.cs" />
     <Compile Include="Components\DialogOverlay\IOverlayDialog.cs" />
     <Compile Include="Components\DialogOverlay\Impl\Portal\DialogOverlayPortalView.xaml.cs">

ClipboardMachinery/ClipboardMachinery/Common/Screen/ClipPageBase.cs

@@ -15,11 +15,11 @@ public abstract class ClipPageBase : LazyPageBase<ClipViewModel, ClipModel>, IHa
 
         protected readonly IDataRepository dataRepository;
         protected readonly IEventAggregator eventAggregator;
-        protected readonly IViewModelFactory vmFactory;
+        protected readonly IClipFactory vmFactory;
 
         #endregion
 
-        protected ClipPageBase(int batchSize, IDataRepository dataRepository, IEventAggregator eventAggregator, IViewModelFactory vmFactory)
+        protected ClipPageBase(int batchSize, IDataRepository dataRepository, IEventAggregator eventAggregator, IClipFactory vmFactory)
             : base(dataRepository.CreateLazyClipProvider(batchSize)) {
 
             this.dataRepository = dataRepository;

ClipboardMachinery/ClipboardMachinery/Components/Clip/ClipModel.cs

@@ -1,6 +1,7 @@
-using Caliburn.Micro;
+using System.Collections.Generic;
+using System.Linq;
+using Caliburn.Micro;
 using ClipboardMachinery.Components.Tag;
-using System;
 
 namespace ClipboardMachinery.Components.Clip {
 
@@ -10,7 +11,7 @@ public class ClipModel : PropertyChangedBase {
 
         public int Id {
             get => id;
-            set {
+            private set {
                 if (id == value) {
                     return;
                 }
@@ -22,7 +23,7 @@ public int Id {
 
         public string Content {
             get => rawContent;
-            set {
+            private set {
                 if (rawContent == value) {
                     return;
                 }
@@ -33,7 +34,7 @@ public string Content {
         }
 
         public BindableCollection<TagModel> Tags {
-            set; get;
+            get;
         }
 
         #endregion
@@ -45,8 +46,10 @@ public BindableCollection<TagModel> Tags {
 
         #endregion
 
-        public ClipModel() {
-            Tags = new BindableCollection<TagModel>();
+        public ClipModel(int id, string content, IEnumerable<TagModel> tags) {
+            Id = id;
+            Content = content;
+            Tags = new BindableCollection<TagModel>(tags ?? Enumerable.Empty<TagModel>());
         }
 
     }

ClipboardMachinery/ClipboardMachinery/Components/ColorGallery/ColorGalleryViewModel.cs

@@ -2,6 +2,7 @@
 using ClipboardMachinery.Components.Buttons.ActionButton;
 using ClipboardMachinery.Plumbing.Factories;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -54,17 +55,14 @@ public ActionButtonViewModel NextPageButton {
 
         #region Fields
 
-        private readonly IColorGalleryFactory colorGalleryFactory;
 
         private IColorPalette selectedPreset;
         private Color selectedColor;
 
         #endregion
 
-        public ColorGalleryViewModel(IColorGalleryFactory colorGalleryFactory, Func<ActionButtonViewModel> actionButtonFactory) {
-            this.colorGalleryFactory = colorGalleryFactory;
-
-            Presets = new BindableCollection<IColorPalette>(colorGalleryFactory.GetAllPresets());
+        public ColorGalleryViewModel(IEnumerable<IColorPalette> colorPalettes, Func<ActionButtonViewModel> actionButtonFactory) {
+            Presets = new BindableCollection<IColorPalette>(colorPalettes);
             SelectedPreset = Presets.FirstOrDefault();
 
             // Create control buttons
@@ -79,16 +77,6 @@ public ColorGalleryViewModel(IColorGalleryFactory colorGalleryFactory, Func<Acti
             NextPageButton.ClickAction = HandleNextPresetClick;
         }
 
-        protected override async Task OnDeactivateAsync(bool close, CancellationToken cancellationToken) {
-            if (close) {
-                foreach (IColorPalette preset in Presets) {
-                    colorGalleryFactory.Release(preset);
-                }
-            }
-
-            await base.OnDeactivateAsync(close, cancellationToken);
-        }
-
         #region Actions
 
         public void SelectColor(Color newColor) {

ClipboardMachinery/ClipboardMachinery/Components/Navigator/NavigatorViewModel.cs

@@ -45,19 +45,22 @@ public string SelectedPageTitle
         #endregion
 
         public NavigatorViewModel(
-            IScreenPage[] availablePages, ILogger logger,
+            IEnumerable<IScreenPage> availablePages, ILogger logger,
             Func<ActionButtonViewModel> actionButtonFactory, Func<SelectableButtonViewModel> selectableButtonFactory) {
 
             Logger = logger;
+            List<IScreenPage> pages = availablePages.ToList();
+
+            // Print out available pages into log
             Logger.Info("Listing available pages for the navigator:");
-            foreach (IScreenPage page in availablePages) {
+            foreach (IScreenPage page in pages) {
                 Logger.Info($" - Title={page.Title}, Type={page.GetType().FullName}");
             }
 
-            // Automatically create pages from ViewModels that implements IScreenPage
-            List<IScreenPage> pages = availablePages.ToList();
+            // Order pages by it's defined order
             pages.Sort((x, y) => x.Order.CompareTo(y.Order));
 
+            // Create view models from available page definitions
             Pages = new BindableCollection<SelectableButtonViewModel>(
                 pages.Select(page => {
                     SelectableButtonViewModel button = selectableButtonFactory.Invoke();

ClipboardMachinery/ClipboardMachinery/Components/Tag/TagModel.cs

@@ -2,7 +2,6 @@
 using Caliburn.Micro;
 using System.Windows.Media;
 using ClipboardMachinery.Core;
-using ClipboardMachinery.Core.DataStorage;
 
 namespace ClipboardMachinery.Components.Tag {
 

ClipboardMachinery/ClipboardMachinery/Components/TagTypeLister/TagTypeListerViewModel.cs

@@ -30,12 +30,12 @@ private set {
 
         #region Fields
 
-        private readonly IViewModelFactory vmFactory;
+        private readonly IClipFactory vmFactory;
         private TagTypeModel selectedItem;
 
         #endregion
 
-        public TagTypeListerViewModel(IDataRepository dataRepository, IViewModelFactory vmFactory) : base(dataRepository.CreateLazyTagTypeProvider(15)) {
+        public TagTypeListerViewModel(IDataRepository dataRepository, IClipFactory vmFactory) : base(dataRepository.CreateLazyTagTypeProvider(15)) {
             this.vmFactory = vmFactory;
         }
 

ClipboardMachinery/ClipboardMachinery/Pages/Favorites/FavoritesViewModel.cs

@@ -23,7 +23,7 @@ public byte Order
 
         #endregion
 
-        public FavoritesViewModel(IDataRepository dataRepository, IEventAggregator eventAggregator, IViewModelFactory vmFactory) : base(15, dataRepository, eventAggregator, vmFactory) {
+        public FavoritesViewModel(IDataRepository dataRepository, IEventAggregator eventAggregator, IClipFactory vmFactory) : base(15, dataRepository, eventAggregator, vmFactory) {
             ((ClipLazyProvider) DataProvider).ApplyTagFilter("category", "favorite");
         }
 

ClipboardMachinery/ClipboardMachinery/Pages/History/HistoryViewModel.cs

@@ -25,7 +25,7 @@ public byte Order
 
         #endregion
 
-        public HistoryViewModel(IDataRepository dataRepository, IEventAggregator eventAggregator, IViewModelFactory vmFactory) : base(15, dataRepository, eventAggregator, vmFactory) {
+        public HistoryViewModel(IDataRepository dataRepository, IEventAggregator eventAggregator, IClipFactory vmFactory) : base(15, dataRepository, eventAggregator, vmFactory) {
         }
 
         #region Logic