Dev

GitVersion.yml

@@ -0,0 +1 @@
+assembly-file-versioning-format: '{Major}.{Minor}.{BuildMetaData ?? 0}.0'

README.md

@@ -1,19 +1,9 @@
 # Yugen Mosaic UWP
 
-## The Toolkit is a collection of helper functions, custom controls, and app services. It helps develop common task for UWP apps. 
+Yugen Mosaic is a free app that helps you to create digital art pictures made from your own pictures. For example you can create a photo mosaic, an image composed of many tiled photos.
 
-### Contributing
+## Contributing
 Everyone is welcome to contribute, if you're looking to help out with the project, feel free to join and submit anything that you find useful. If you find an issue please could you raise it in the issues section or it would be fantastic if you could have a look at rectifying the issue and submitting a pull request. 
 
-### Getting started
+## Getting started
 The project has been primarily built for the universal Windows platform (UWP), so you'll need the latest version of [Visual Studio 2019](https://www.visualstudio.com/) (including the community edition) and the latest Windows 10 SDK which you can install as part of the Visual Studio installer.
-
-I'm using github packages from my toolkit for nuget, to restore them in VS you need to add this,
-go to tools -> options -> nuget package manager -> package sources
-Name: Github (or whatever)
-Source: https://nuget.pkg.github.com/emiliano84/index.json
-
-when VS will ask for credentials
-username: emiliano84
-password: {ask me for the token}
-

Yugen.Mosaic.Uwp/App.xaml.cs

@@ -7,24 +7,26 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
-using Yugen.Mosaic.Uwp.Helpers;
+using Yugen.Mosaic.Uwp.Extensions;
 using Yugen.Mosaic.Uwp.Services;
+using Yugen.Mosaic.Uwp.Views;
+using Yugen.Toolkit.Standard.Extensions;
 
 namespace Yugen.Mosaic.Uwp
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    sealed partial class App : Application
+    public sealed partial class App : Application
     {
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
         /// </summary>
         public App()
         {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
+            InitializeComponent();
+            Suspending += OnSuspending;
 
             AppCenter.Start("7df4b441-69ae-49c5-b27d-5a532f33b554",
                    typeof(Analytics), typeof(Crashes));
@@ -76,10 +78,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
         /// </summary>
         /// <param name="sender">The Frame which failed navigation</param>
         /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
+        private void OnNavigationFailed(object sender, NavigationFailedEventArgs e) => throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
 
         /// <summary>
         /// Invoked when application execution is being suspended.  Application state is saved
@@ -90,7 +89,7 @@ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
         /// <param name="e">Details about the suspend request.</param>
         private void OnSuspending(object sender, SuspendingEventArgs e)
         {
-            var deferral = e.SuspendingOperation.GetDeferral();
+            SuspendingDeferral deferral = e.SuspendingOperation.GetDeferral();
             //TODO: Save application state and stop any background activity
             deferral.Complete();
         }

Yugen.Mosaic.Uwp/Controls/AlignmentGrid.cs

@@ -60,44 +60,44 @@ private static void OnPropertyChanged(DependencyObject dependencyObject, Depende
         /// </summary>
         public Brush LineBrush
         {
-            get { return (Brush)GetValue(LineBrushProperty); }
-            set { SetValue(LineBrushProperty, value); }
+            get => (Brush)GetValue(LineBrushProperty);
+            set => SetValue(LineBrushProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the step to use horizontally.
         /// </summary>
         public double HorizontalStep
         {
-            get { return (double)GetValue(HorizontalStepProperty); }
-            set { SetValue(HorizontalStepProperty, value); }
+            get => (double)GetValue(HorizontalStepProperty);
+            set => SetValue(HorizontalStepProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the step to use horizontally.
         /// </summary>
         public double VerticalStep
         {
-            get { return (double)GetValue(VerticalStepProperty); }
-            set { SetValue(VerticalStepProperty, value); }
+            get => (double)GetValue(VerticalStepProperty);
+            set => SetValue(VerticalStepProperty, value);
         }
 
         /// <summary>
         /// Get or set the container width.
         /// </summary>
         public double ContainerWidth
         {
-            get { return (double)GetValue(ContainerWidthProperty); }
-            set { SetValue(ContainerWidthProperty, value); }
+            get => (double)GetValue(ContainerWidthProperty);
+            set => SetValue(ContainerWidthProperty, value);
         }
 
         /// <summary>
         /// Get or set the container height.
         /// </summary>
         public double ContainerHeight
         {
-            get { return (double)GetValue(ContainerHeightProperty); }
-            set { SetValue(ContainerHeightProperty, value); }
+            get => (double)GetValue(ContainerHeightProperty);
+            set => SetValue(ContainerHeightProperty, value);
         }
 
         /// <summary>
@@ -121,7 +121,7 @@ private void Rebuild()
             containerCanvas.Children.Clear();
             var horizontalStep = HorizontalStep;
             var verticalStep = VerticalStep;
-            var brush = LineBrush ?? (Brush)Application.Current.Resources["ApplicationForegroundThemeBrush"];
+            Brush brush = LineBrush ?? (Brush)Application.Current.Resources["ApplicationForegroundThemeBrush"];
 
             if (horizontalStep > 0)
             {
@@ -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,16 +149,13 @@ 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);
                 }
             }
         }
 
-        private void AlignmentGrid_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            Rebuild();
-        }
+        private void AlignmentGrid_SizeChanged(object sender, SizeChangedEventArgs e) => Rebuild();
     }
 }

Yugen.Mosaic.Uwp/SettingsDialog.xaml → Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml

@@ -1,12 +1,12 @@
-<ContentDialog x:Class="Yugen.Mosaic.Uwp.SettingsDialog"
+<ContentDialog x:Class="Yugen.Mosaic.Uwp.Controls.SettingsDialog"
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                xmlns:xaml="using:Windows.UI.Xaml"
                xmlns:vm="using:Yugen.Mosaic.Uwp.ViewModels"
                xmlns:converters="using:Yugen.Toolkit.Uwp.Converters"
-               RequestedTheme="{Binding ElementTheme}"
+               RequestedTheme="{x:Bind ViewModel.ElementTheme, Mode=OneWay}"
                mc:Ignorable="d">
 
     <ContentDialog.Resources>
@@ -35,7 +35,7 @@
                 <Button Style="{StaticResource SoftRevealButtonStyle}"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
-                        Tapped="Button_Tapped">
+                        Command="{x:Bind HideCommand}">
                     <FontIcon Glyph="" />
                 </Button>
             </Grid>
@@ -46,24 +46,24 @@
                            Foreground="{ThemeResource AppForegroundBrush}"
                            Style="{StaticResource SubtitleTextBlockStyle}" />
                 <RadioButton Content="Light"
-                             Command="{Binding SwitchThemeCommand}"
-                             IsChecked="{Binding ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
+                             Command="{x:Bind ViewModel.SwitchThemeCommand}"
+                             IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
                              Foreground="{ThemeResource AppForegroundBrush}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Light</xaml:ElementTheme>
                     </RadioButton.CommandParameter>
                 </RadioButton>
                 <RadioButton Content="Dark"
-                             Command="{Binding SwitchThemeCommand}"
-                             IsChecked="{Binding ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
+                             Command="{x:Bind ViewModel.SwitchThemeCommand}"
+                             IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
                              Foreground="{ThemeResource AppForegroundBrush}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Dark</xaml:ElementTheme>
                     </RadioButton.CommandParameter>
                 </RadioButton>
                 <RadioButton Content="Default"
-                             Command="{Binding SwitchThemeCommand}"
-                             IsChecked="{Binding ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
+                             Command="{x:Bind ViewModel.SwitchThemeCommand}"
+                             IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
                              Foreground="{ThemeResource AppForegroundBrush}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Default</xaml:ElementTheme>
@@ -80,32 +80,32 @@
 
                 <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
                            Style="{StaticResource CaptionTextBlockStyle}">
-                    <Run Text="{Binding AppName}"
+                    <Run Text="{x:Bind ViewModel.AppName}"
                          FontWeight="SemiBold" />
                     <LineBreak />
-                    <Run Text="{Binding AppVersion}" />
+                    <Run Text="{x:Bind ViewModel.AppVersion}" />
                 </TextBlock>
 
                 <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
                            Style="{StaticResource CaptionTextBlockStyle}">
                     <Run Text="Developed by"
                          FontWeight="SemiBold" />
                     <LineBreak />
-                    <Run Text="{Binding Publisher}" />
+                    <Run Text="{x:Bind ViewModel.Publisher}" />
                 </TextBlock>
 
                 <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
                            Style="{StaticResource CaptionTextBlockStyle}">
                     <Run Text="Colaborators"
                          FontWeight="SemiBold" />
                     <LineBreak />
-                    <Run Text="{Binding Collaborator[0]}" />
+                    <Run Text="{x:Bind ViewModel.Collaborator[0]}" />
                     <LineBreak />
-                    <Run Text="{Binding Collaborator[1]}" />
+                    <Run Text="{x:Bind ViewModel.Collaborator[1]}" />
                 </TextBlock>
 
                 <HyperlinkButton Content="Rate and review"
-                                 Command="{Binding LaunchRateAndReviewCommand}" />
+                                 Command="{x:Bind ViewModel.LaunchRateAndReviewCommand}" />
 
             </StackPanel>
 

Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+using Windows.UI.Xaml.Controls;
+using Yugen.Mosaic.Uwp.ViewModels;
+using Yugen.Toolkit.Standard.Commands;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Yugen.Mosaic.Uwp.Controls
+{
+    public sealed partial class SettingsDialog : ContentDialog
+    {
+        private ICommand _hideCommand;
+        public SettingsViewModel ViewModel => DataContext as SettingsViewModel;
+
+        public SettingsDialog()
+        {
+            InitializeComponent();
+            //DataContext = new SettingsViewModel();
+        }
+
+        public ICommand HideCommand => _hideCommand ?? (_hideCommand = new RelayCommand(() => Hide()));
+    }
+}

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/Enums/MosaicTypeEnum.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+
+namespace Yugen.Mosaic.Uwp.Enums
+{
+    public enum MosaicTypeEnum
+    {
+        [Description("Classic")]
+        Classic,
+        [Description("Random")]
+        Random,
+        [Description("Adjust Hue")]
+        AdjustHue,
+        [Description("Plain Color")]
+        PlainColor
+    }
+}

Yugen.Mosaic.Uwp/Enums/OnboardingStage.cs

@@ -0,0 +1,13 @@
+namespace Yugen.Mosaic.Uwp.Enums
+{
+    public enum OnboardingStage
+    {
+        MasterImage,
+        AddTiles,
+        TileProperties,
+        MosaicType,
+        OutputProperties,
+        Generate,
+        Save
+    }
+}

Yugen.Mosaic.Uwp/Extensions/EnumExtensions.cs

@@ -0,0 +1,33 @@
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Yugen.Mosaic.Uwp.Extensions
+{
+    public static class EnumExtensions
+    {
+        public static string GetStringRepresentation(this Enum en)
+        {
+            if (en == null)
+            {
+                return null;
+            }
+
+            Type type = en.GetType();
+
+            MemberInfo[] memInfo = type.GetMember(en.ToString());
+
+            if (memInfo != null && memInfo.Length > 0)
+            {
+                var attrs = memInfo[0].GetCustomAttributes(typeof(DescriptionAttribute), false);
+
+                if (attrs != null && attrs.Length > 0)
+                {
+                    return ((DescriptionAttribute)attrs[0]).Description;
+                }
+            }
+
+            return en.ToString();
+        }
+    }
+}