Feature/refactor

Yugen.Mosaic.Uwp/Controls/AlignmentGrid.cs

@@ -133,7 +133,7 @@ private void Rebuild()
                         Height = ActualHeight,
                         Fill = brush
                     };
-                    Canvas.SetLeft(line, MathHelper.RangesConverter(x, 0, ContainerWidth, 0, ActualWidth));
+                    Canvas.SetLeft(line, MathHelper.RangeConvert(x, 0, ContainerWidth, 0, ActualWidth));
 
                     containerCanvas.Children.Add(line);
                 }
@@ -149,7 +149,7 @@ private void Rebuild()
                         Height = 1,
                         Fill = brush
                     };
-                    Canvas.SetTop(line, MathHelper.RangesConverter(y, 0, ContainerHeight, 0, ActualHeight));
+                    Canvas.SetTop(line, MathHelper.RangeConvert(y, 0, ContainerHeight, 0, ActualHeight));
 
                     containerCanvas.Children.Add(line);
                 }

Yugen.Mosaic.Uwp/Enums/FileFormat.cs

@@ -1,11 +1,18 @@
-namespace Yugen.Mosaic.Uwp.Enums
+using System.ComponentModel;
+
+namespace Yugen.Mosaic.Uwp.Enums
 {
     public enum FileFormat
     {
+        [Description(".jpg")]
         Jpg,
+        [Description(".png")]
         Png,
+        [Description(".bmp")]
         Bmp,
+        [Description(".tiff")]
         Tiff,
+        [Description(".gif")]
         Gif
     }
 }

Yugen.Mosaic.Uwp/Models/MosaicTypeEnum.cs → Yugen.Mosaic.Uwp/Enums/MosaicTypeEnum.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Yugen.Mosaic.Uwp.Models
+namespace Yugen.Mosaic.Uwp.Enums
 {
     public enum MosaicTypeEnum
     {

Yugen.Mosaic.Uwp/Models/OnboardingStage.cs → Yugen.Mosaic.Uwp/Enums/OnboardingStage.cs

@@ -1,4 +1,4 @@
-namespace Yugen.Mosaic.Uwp.Models
+namespace Yugen.Mosaic.Uwp.Enums
 {
     public enum OnboardingStage
     {

Yugen.Mosaic.Uwp/Helpers/ColorHelper.cs

@@ -40,7 +40,6 @@ private static Rgba32 GetAverageColor(Image<Rgba32> source, int startX, int star
             return new Rgba32(Convert.ToByte(aR), Convert.ToByte(aG), Convert.ToByte(aB));
         }
 
-
         public static int GetDifference(Rgba32 source, Rgba32 target)
         {
             var dR = Math.Abs(source.R - target.R);

Yugen.Mosaic.Uwp/Helpers/MathHelper.cs

@@ -1,4 +1,6 @@
-namespace Yugen.Mosaic.Uwp.Helpers
+using System;
+
+namespace Yugen.Mosaic.Uwp.Helpers
 {
     public static class MathHelper
     {
@@ -12,8 +14,20 @@ public static class MathHelper
         /// <param name="newMin"></param>
         /// <param name="newMax"></param>
         /// <returns>newValue</returns>
-        public static double RangesConverter(double oldValue, double oldMin, double oldMax, double newMin, double newMax) =>
+        public static double RangeConvert(double oldValue, double oldMin, double oldMax, double newMin, double newMax) =>
             (oldValue - oldMin) * (newMax - newMin) /
                 (oldMax - oldMin) + newMin;
+
+        public static Tuple<int, int> RatioConvert(int width, int height, int newHeight, int newWidth)
+        {
+            //calculate the ratio
+            var ratio = (double)width / (double)height;
+
+            //set height of image to boxHeight and check if resulting width is less than boxWidth, 
+            //else set width of image to boxWidth and calculate new height
+            return (int)(newHeight * ratio) <= newWidth
+                ? new Tuple<int, int>((int)(newHeight * ratio), newHeight)
+                : new Tuple<int, int>(newWidth, (int)(newWidth / ratio));
+        }
     }
 }

Yugen.Mosaic.Uwp/Helpers/OnboardingHelper.cs

@@ -1,4 +1,5 @@
 using Windows.UI.Xaml;
+using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Models;
 
 namespace Yugen.Mosaic.Uwp.Helpers
@@ -7,16 +8,15 @@ namespace Yugen.Mosaic.Uwp.Helpers
     public static class OnboardingHelper
     {
         private const string SettingsKey = "OnboardingIsEnabled";
+        private static OnboardingElement[] _onboardingElements;
+        private static int _step;
 
         public static bool IsDisabled
         {
             get => SettingsHelper.Read<bool>(SettingsKey);
             set => SettingsHelper.Write<bool>(SettingsKey, value);
         }
 
-        private static int _step;
-        private static OnboardingElement[] _onboardingElements;
-
         public static void Init(FrameworkElement[] frameworkElements) => _onboardingElements = new OnboardingElement[]
             {
                 new OnboardingElement(

Yugen.Mosaic.Uwp/Helpers/ResourceHelper.cs

@@ -6,6 +6,7 @@ public static class ResourceHelper
     {
         private static readonly ResourceLoader _resourceLoader = _resourceLoader ?? new ResourceLoader();
 
-        public static string GetText(string key) => _resourceLoader.GetString(key);
+        public static string GetText(string key) => 
+            _resourceLoader.GetString(key);
     }
 }

Yugen.Mosaic.Uwp/Interfaces/IMosaicService.cs

@@ -2,7 +2,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using System.IO;
 using Windows.Storage.Streams;
-using Yugen.Mosaic.Uwp.Models;
+using Yugen.Mosaic.Uwp.Enums;
 
 namespace Yugen.Mosaic.Uwp.Interfaces
 {

Yugen.Mosaic.Uwp/Models/MosaicType.cs

@@ -1,4 +1,5 @@
-using Yugen.Mosaic.Uwp.Extensions;
+using Yugen.Mosaic.Uwp.Enums;
+using Yugen.Mosaic.Uwp.Extensions;
 
 namespace Yugen.Mosaic.Uwp.Models
 {

Yugen.Mosaic.Uwp/Models/OnboardingElement.cs

@@ -1,24 +1,22 @@
 using Windows.UI.Xaml;
+using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Helpers;
 
 namespace Yugen.Mosaic.Uwp.Models
 {
     public class OnboardingElement
     {
-        public string Title { get; set; }
-
-        public string Subtitle { get; set; }
-
-        public FrameworkElement Target { get; set; }
-
-        public OnboardingStage Stage { get; set; }
-
         public OnboardingElement(FrameworkElement target, OnboardingStage stage)
         {
             Title = ResourceHelper.GetText($"OnboardingStage{stage}Title");
             Subtitle = ResourceHelper.GetText($"OnboardingStage{stage}Description");
             Target = target;
             Stage = stage;
         }
+
+        public OnboardingStage Stage { get; set; }
+        public string Subtitle { get; set; }
+        public FrameworkElement Target { get; set; }
+        public string Title { get; set; }
     }
 }

Yugen.Mosaic.Uwp/Models/Tile.cs

@@ -18,29 +18,3 @@ public Tile(Image<Rgba32> originalImage, string name)
         }
     }
 }
-
-//Rgba32 targetColor = _averageColor.ToPixel<Rgba32>();
-
-//Color clAvg = Color.FromRgba(255, Convert.ToByte(R), Convert.ToByte(G), Convert.ToByte(B));
-//Rgba32 clAvg = Color.FromRgba(255, Convert.ToByte(R), Convert.ToByte(G), Convert.ToByte(B));
-//Rgba32 clAvg = new Rgba32(Convert.ToByte(R), Convert.ToByte(G), Convert.ToByte(B), 255);
-
-//TPixel pixelColor = new TPixel();
-//pixelColor.FromRgba32(clAvg);
-
-//public async Task RunTasks(WriteableBitmap clone)
-//{
-//    var tasks = new List<Task>();
-
-//    tasks.Add(Task.Run(() => DoWork(400, 1, clone)));
-//    tasks.Add(Task.Run(() => DoWork(200, 2, clone)));
-//    tasks.Add(Task.Run(() => DoWork(300, 3, clone)));
-
-//    await Task.WhenAll(tasks);
-//}
-
-//public async Task DoWork(int delay, int n, WriteableBitmap masterImageSource)
-//{
-//    await Task.Delay(delay);
-//    System.Diagnostics.Debug.WriteLine($"{n} {masterImageSource.PixelHeight}");
-//}

Yugen.Mosaic.Uwp/Models/TileBmp.cs

@@ -4,13 +4,13 @@ namespace Yugen.Mosaic.Uwp.Models
 {
     public class TileBmp
     {
-        public string Name { get; set; }
-        public BitmapImage Image { get; set; }
-
         public TileBmp(string name, BitmapImage image)
         {
             Name = name;
             Image = image;
         }
+
+        public BitmapImage Image { get; set; }
+        public string Name { get; set; }
     }
 }

Yugen.Mosaic.Uwp/Services/MosaicService.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml.Media.Imaging;
+using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Helpers;
 using Yugen.Mosaic.Uwp.Interfaces;
 using Yugen.Mosaic.Uwp.Models;