Merge pull request #102 from Simnico99/MicaWPF.Lite-Title-Fix

Mica wpf.lite title fix

README.md

@@ -153,7 +153,7 @@ Here is an exemple:
     x:Class="MicaWPF.DesktopApp.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mica="clr-namespace:MicaWPF.Styles;assembly=MicaWPF" <!-- For the lite version: clr-namespace:MicaWPF.Lite.Styles;assembly=MicaWPF.Lite -->
+    xmlns:mica="clr-namespace:MicaWPF.Styles;assembly=MicaWPF" <!-- For the lite version: clr-namespace:MicaWPF.Styles;assembly=MicaWPF.Lite -->
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>

src/MicaWPF.Core/Helpers/ServiceLocatorHelper.cs

@@ -19,7 +19,7 @@ internal static class ServiceLocatorHelper
     /// <returns>The current namespace.</returns>
     public static string GetNamespace()
     {
-        return _assemblies.Any(x => x.GetName().Name == "MicaWPF") ? "MicaWPF" : "MicaWPF.Lite";
+        return _assemblies.Any(x => x.GetName().Name == "MicaWPF") ? "MicaWPF" : "MicaWPF.Core";
     }
 
     /// <summary>
@@ -36,6 +36,11 @@ public static T GetService<T>()
         // Simplified assembly search with pattern matching
         var currentAssembly = _assemblies.FirstOrDefault(x => x.GetName().Name is "MicaWPF" or "MicaWPF.Lite");
 
+        if (currentAssembly?.GetName().Name == "MicaWPF.Lite")
+        {
+            currentAssembly = _assemblies.FirstOrDefault(x => x.GetName().Name is "MicaWPF.Core");
+        }
+
         if (currentAssembly is not null)
         {
             var instance = GetInstanceFromAssembly<T>(currentAssembly, serviceType);

src/MicaWPF.Core/MicaWPF.Core.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net461;net47;net48;net481;netcoreapp3.1;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+		<TargetMinimumPlatformVersion>7.0</TargetMinimumPlatformVersion>
 		<UseWPF>true</UseWPF>
 		<Copyright>Copyright (c) 2021 Simnico99</Copyright>
 		<RepositoryUrl>https://github.com/Simnico99/MicaWPF</RepositoryUrl>

src/MicaWPF/Styles/Controls/Dark/GradientBorder.xaml → src/MicaWPF.Core/Styles/Controls/Dark/GradientBorder.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Core.Controls">
 
     <Style x:Key="MicaWPF.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
         <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Brushes.ControlStrokeColorSecondary}" />

src/MicaWPF/Styles/Controls/Light/GradientBorder.xaml → src/MicaWPF.Core/Styles/Controls/Light/GradientBorder.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Core.Controls">
 
     <Style x:Key="MicaWPF.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
         <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Brushes.ControlStrokeColorDefault}" />

src/MicaWPF.Core/Styles/ThemeDictionaryBase.cs

@@ -23,13 +23,13 @@ public ThemeDictionaryBase()
             return;
         }
 
-        if(!WindowsTheme.HasValue)
+        if (!WindowsTheme.HasValue)
         {
             SetTheme(Enums.WindowsTheme.Auto);
         }
     }
 
-    public WindowsTheme? WindowsTheme { get; private set; } = null;
+    public WindowsTheme? WindowsTheme { get; private set; } = Enums.WindowsTheme.Auto;
 
     public virtual string SourceLocation { get; } = string.Empty;
 

src/MicaWPF.Lite/Styles/MicaWPF.Lite.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Lite;component/Styles/Assets/Accent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Assets/Accent.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>

src/MicaWPF.Lite/Styles/ThemeDictionary.cs

@@ -8,5 +8,5 @@ namespace MicaWPF.Lite.Styles;
 
 public sealed class ThemeDictionary : ThemeDictionaryBase
 {
-    public override string SourceLocation { get; } = "pack://application:,,,/MicaWPF.Lite;component/Styles/Themes";
+    public override string SourceLocation { get; } = "pack://application:,,,/MicaWPF.Core;component/Styles/Themes";
 }