Merge pull request #28 from Panda-Sharp/develop

Develop
Yugen-Apps · Sep 29, 2021 · 1990d3a · 1990d3a
2 parents 1383ef8 + 17af699
commit 1990d3a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 24 deletions.
diff --git a/Yugen.Mosaic.Uwp/App.xaml.cs b/Yugen.Mosaic.Uwp/App.xaml.cs
@@ -63,7 +63,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs e)
 
                 // Initial UI styling
                 TitleBarHelper.ExpandViewIntoTitleBar();
-                //TitleBarHelper.StyleTitleBar(...);
+                TitleBarHelper.StyleTitleBar();
 
                 // Create a Frame to act as the navigation context and navigate to the first page
                 rootFrame = new Frame();
@@ -152,7 +152,7 @@ private IServiceProvider ConfigureServices()
 
         private async Task InitializeServices()
         {
-            await Services.GetService<IThemeSelectorService>().InitializeAsync(true);
+            await Services.GetService<IThemeSelectorService>().InitializeAsync();
         }
     }
 }
diff --git a/Yugen.Mosaic.Uwp/Services/WhatsNewDisplayService.cs b/Yugen.Mosaic.Uwp/Services/WhatsNewDisplayService.cs
@@ -3,8 +3,8 @@
 using System;
 using System.Threading.Tasks;
 using Windows.System;
-using Yugen.Mosaic.Uwp.Controls;
 using Yugen.Mosaic.Uwp.Interfaces;
+using Yugen.Mosaic.Uwp.Views.Dialogs;
 
 namespace Yugen.Mosaic.Uwp.Services
 {

diff --git a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
@@ -1,7 +1,6 @@
 using Microsoft.AppCenter.Crashes;
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp;
-using Microsoft.UI.Xaml.Controls;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using System;
@@ -17,11 +16,11 @@
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
-using Yugen.Mosaic.Uwp.Controls;
 using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Helpers;
 using Yugen.Mosaic.Uwp.Interfaces;
 using Yugen.Mosaic.Uwp.Models;
+using Yugen.Mosaic.Uwp.Views.Dialogs;
 using Yugen.Toolkit.Standard.Core.Models;
 using Yugen.Toolkit.Standard.Extensions;
 using Yugen.Toolkit.Standard.Helpers;

diff --git a/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
@@ -39,7 +39,7 @@ public ElementTheme ElementTheme
         private async Task SwitchThemeCommandBehavior(ElementTheme param)
         {
             ElementTheme = param;
-            await _themeSelectorService.SetThemeAsync(param, true);
+            await _themeSelectorService.SetThemeAsync(param);
         }
     }
 }
diff --git a/...n.Mosaic.Uwp/Controls/SettingsDialog.xaml → ...aic.Uwp/Views/Dialogs/SettingsDialog.xaml b/...n.Mosaic.Uwp/Controls/SettingsDialog.xaml → ...aic.Uwp/Views/Dialogs/SettingsDialog.xaml
@@ -1,4 +1,4 @@
-<dialogs:YugenDialog  x:Class="Yugen.Mosaic.Uwp.Controls.SettingsDialog"
+<dialogs:YugenDialog  x:Class="Yugen.Mosaic.Uwp.Views.Dialogs.SettingsDialog"
                       x:Uid="Settings"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/...osaic.Uwp/Controls/SettingsDialog.xaml.cs → ....Uwp/Views/Dialogs/SettingsDialog.xaml.cs b/...osaic.Uwp/Controls/SettingsDialog.xaml.cs → ....Uwp/Views/Dialogs/SettingsDialog.xaml.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Yugen.Mosaic.Uwp.ViewModels;
 
-namespace Yugen.Mosaic.Uwp.Controls
+namespace Yugen.Mosaic.Uwp.Views.Dialogs
 {
     public sealed partial class SettingsDialog
     {

diff --git a/...n.Mosaic.Uwp/Controls/WhatsNewDialog.xaml → ...aic.Uwp/Views/Dialogs/WhatsNewDialog.xaml b/...n.Mosaic.Uwp/Controls/WhatsNewDialog.xaml → ...aic.Uwp/Views/Dialogs/WhatsNewDialog.xaml
@@ -1,4 +1,4 @@
-<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Controls.WhatsNewDialog"
+<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Views.Dialogs.WhatsNewDialog"
                      x:Uid="WhatsNew"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/...osaic.Uwp/Controls/WhatsNewDialog.xaml.cs → ....Uwp/Views/Dialogs/WhatsNewDialog.xaml.cs b/...osaic.Uwp/Controls/WhatsNewDialog.xaml.cs → ....Uwp/Views/Dialogs/WhatsNewDialog.xaml.cs
@@ -2,7 +2,7 @@
 using Windows.UI.Xaml;
 using Yugen.Mosaic.Uwp.ViewModels;
 
-namespace Yugen.Mosaic.Uwp.Controls
+namespace Yugen.Mosaic.Uwp.Views.Dialogs
 {
     public sealed partial class WhatsNewDialog
     {

diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
@@ -80,7 +80,7 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\WhatsNewDialog.xaml.cs">
+    <Compile Include="Views\Dialogs\WhatsNewDialog.xaml.cs">
       <DependentUpon>WhatsNewDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Enums\FileFormat.cs" />
@@ -110,7 +110,7 @@
     <Compile Include="Services\SearchAndReplacePlainColorService.cs" />
     <Compile Include="Services\SearchAndReplaceRandomService.cs" />
     <Compile Include="Services\SearchAndReplaceService.cs" />
-    <Compile Include="Controls\SettingsDialog.xaml.cs">
+    <Compile Include="Views\Dialogs\SettingsDialog.xaml.cs">
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\MainViewModel.cs" />
@@ -183,46 +183,46 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\WhatsNewDialog.xaml">
+    <Page Include="Views\Dialogs\WhatsNewDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\MainPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\SettingsDialog.xaml">
+    <Page Include="Views\Dialogs\SettingsDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>4.3.0</Version>
+      <Version>4.4.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>4.3.0</Version>
+      <Version>4.4.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp">
-      <Version>7.0.2</Version>
+      <Version>7.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>7.0.2</Version>
+      <Version>7.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>7.0.2</Version>
+      <Version>7.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.2</Version>
+      <Version>2.7.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="SixLabors.ImageSharp">
-      <Version>1.0.3</Version>
+      <Version>1.0.4</Version>
     </PackageReference>
     <PackageReference Include="SixLabors.ImageSharp.Drawing">
       <Version>1.0.0-beta13</Version>
@@ -234,13 +234,13 @@
       <Version>1.6.8</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Standard">
-      <Version>1.0.46</Version>
+      <Version>1.0.48</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Uwp">
-      <Version>1.0.46</Version>
+      <Version>1.0.48</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Uwp.Controls">
-      <Version>1.0.46</Version>
+      <Version>1.0.48</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Extensions.Logging">
       <Version>3.0.1</Version>