Merge pull request #145 from FmgLib/feature/v8.8.5

gonultasmf · web-flow · commit 0e74c8ccdf64 · 2024-10-20T21:46:40.000+03:00
Feature/v8.8.5
diff --git a/FmgLib.MauiMarkup.sln b/FmgLib.MauiMarkup.sln
@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FE0466FD-1CF3-4D08-B3B2-B6E0EB476831}"
 	ProjectSection(SolutionItems) = preProject
 		LICENSE.txt = LICENSE.txt
+		README.md = README.md
 		TODO.txt = TODO.txt
 	EndProjectSection
 EndProject
diff --git a/README.md b/README.md
@@ -765,7 +765,7 @@ public partial class App : Application
         this.MainPage(
 	        new Shell()
 	        .ItemTemplate(() => new ShellItemTemplate())
-            .Resources(AppResources.Default)
+            .Resources(new ResourceDictionary().MergedDictionaries(AppStyles.Default))
 	        .Items(
 				new FlyoutItem()
 				.FlyoutDisplayOptions(FlyoutDisplayOptions.AsMultipleItems)
diff --git a/sample/DalluiApp/DalluiApp.csproj b/sample/DalluiApp/DalluiApp.csproj
@@ -83,7 +83,7 @@
 	<ItemGroup>
 		<PackageReference Include="CardsView.Maui" Version="0.0.9" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
-		<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/sample/F1TV/F1TV.csproj b/sample/F1TV/F1TV.csproj
@@ -74,7 +74,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
-		<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/sample/FruitApp/FruitApp.csproj b/sample/FruitApp/FruitApp.csproj
@@ -74,7 +74,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AcrylicView.Maui" Version="2.1.3" />
-		<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/sample/Game2048/Game2048Maui.csproj b/sample/Game2048/Game2048Maui.csproj
@@ -74,7 +74,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.71" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.71" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/sample/GeneratedExam/GeneratedExam.csproj b/sample/GeneratedExam/GeneratedExam.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FmgLib.MauiMarkup" Version="8.8.1" />
+    <PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
     <PackageReference Include="SkiaSharp.Extended.UI.Maui" Version="2.0.0" />
     <PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4.0" />
diff --git a/sample/MatchingImage/MatchingImage.csproj b/sample/MatchingImage/MatchingImage.csproj
@@ -77,7 +77,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/sample/MyOrderApp/MyOrderApp.csproj b/sample/MyOrderApp/MyOrderApp.csproj
@@ -69,10 +69,9 @@
 		<None Remove="Resources\Images\white_bread.png" />
 		<None Remove="Resources\Raw\completed.json" />
 	</ItemGroup>
+	
 	<ItemGroup>
-		<ProjectReference Include="..\..\src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj" />
-	</ItemGroup>
-	<ItemGroup>
+		<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
 		<PackageReference Include="AutoMapper" Version="13.0.1" />
 		<PackageReference Include="LiteDB" Version="5.0.20" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.*" Condition="'$(Configuration)' == 'Debug'" />
diff --git a/src/FmgLib.MauiMarkup/Extensions/ApplicationExtension.cs b/src/FmgLib.MauiMarkup/Extensions/ApplicationExtension.cs
@@ -1,4 +1,6 @@
-﻿namespace FmgLib.MauiMarkup;
+﻿using Microsoft.Maui.Controls.StyleSheets;
+
+namespace FmgLib.MauiMarkup;
 
 public static partial class ApplicationExtension
 {
@@ -99,6 +101,7 @@ public static T OnRequestedThemeChanged<T>(this T self, System.Action<T> action)
         self.RequestedThemeChanged += (o, arg) => action(self);
         return self;
     }
+
     public static T MainPage<T>(this T self, Page? mainPage) where T : Application
     {
         self.MainPage = mainPage;
@@ -116,4 +119,10 @@ public static T UserAppTheme<T>(this T self, AppTheme userAppTheme) where T : Ap
         self.UserAppTheme = userAppTheme;
         return self;
     }
+
+    public static T AccentColor<T>(this T self, Color accentColor) where T : Application
+    {
+        Application.AccentColor = accentColor;
+        return self;
+    }
 }
diff --git a/src/FmgLib.MauiMarkup/Extensions/ResourceDictionaryExtension.cs b/src/FmgLib.MauiMarkup/Extensions/ResourceDictionaryExtension.cs
@@ -2,17 +2,75 @@
 
 public static partial class ResourceDictionaryExtension
 {
-    public static ResourceDictionary AddResource(this ResourceDictionary dic, string key, object value)
+    public static T AddResource<T>(this T self, string key, object value) where T : Microsoft.Maui.Controls.ResourceDictionary
     {
-        dic.Add(key, value);
+        self.Add(key, value);
 
-        return dic;
+        return self;
     }
 
-    public static ResourceDictionary RemoveResource(this ResourceDictionary dic, string key)
+    public static T AddResource<T>(this T self, Style style) where T : Microsoft.Maui.Controls.ResourceDictionary
     {
-        dic.Remove(key);
+        self.Add(style);
 
-        return dic;
+        return self;
+    }
+
+    public static T AddResource<T>(this T self, Microsoft.Maui.Controls.StyleSheets.StyleSheet styleSheet) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Add(styleSheet);
+
+        return self;
+    }
+
+    public static T AddResource<T>(this T self, string strStyleSheet) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Add(Microsoft.Maui.Controls.StyleSheets.StyleSheet.FromReader(new StringReader(strStyleSheet)));
+
+        return self;
+    }
+
+    public static T AddResource<T>(this T self, ResourceDictionary mergedResourceDictionary) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Add(mergedResourceDictionary);
+
+        return self;
+    }
+
+    public static T RemoveResource<T>(this T self, string key) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Remove(key);
+
+        return self;
+    }
+
+    public static T MergedResources<T>(this T self, params ResourceDictionary[] resources) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        foreach (var resource in resources)
+        {
+            self.MergedDictionaries.Add(resource);
+        }
+        return self;
+    }
+
+    public static T MergedResources<T>(this T self, IList<ResourceDictionary> resources) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        foreach (var resource in resources)
+        {
+            self.MergedDictionaries.Add(resource);
+        }
+        return self;
+    }
+
+    public static T Source<T>(this T self, Uri uri) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Source = uri;
+        return self;
+    }
+
+    public static T Source<T>(this T self, string url) where T : Microsoft.Maui.Controls.ResourceDictionary
+    {
+        self.Source = new Uri(url);
+        return self;
     }
 }
diff --git a/src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj b/src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj
@@ -11,7 +11,7 @@
 		<PackageId>FmgLib.MauiMarkup</PackageId>
 		<Summary>FmgLib.MauiMarkup with C# Markup classes and fluent helper methods</Summary>
 		<Title>FmgLib.MauiMarkup</Title>
-		<Version>8.8.4</Version>
+		<Version>8.8.5</Version>
 		<Authors>FmgYazılım</Authors>
 		<Company>Fmg Yazılım</Company>
 		<Copyright>©2024</Copyright>
diff --git a/src/FmgLib.MauiMarkup/README.md b/src/FmgLib.MauiMarkup/README.md
@@ -765,7 +765,7 @@ public partial class App : Application
         this.MainPage(
 	        new Shell()
 	        .ItemTemplate(() => new ShellItemTemplate())
-            .Resources(AppResources.Default)
+            .Resources(new ResourceDictionary().MergedDictionaries(AppStyles.Default))
 	        .Items(
 				new FlyoutItem()
 				.FlyoutDisplayOptions(FlyoutDisplayOptions.AsMultipleItems)
diff --git a/templates/FmgLib.MauiMarkup.TemplateApp/FmgLib.MauiMarkup.Template.csproj b/templates/FmgLib.MauiMarkup.TemplateApp/FmgLib.MauiMarkup.Template.csproj
@@ -4,7 +4,7 @@
 		<!-- The package metadata. Fill in the properties marked as TODO below -->
 		<!-- Follow the instructions on https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
 		<PackageId>FmgLib.MauiMarkup.Template</PackageId>
-		<PackageVersion>3.3.1</PackageVersion>
+		<PackageVersion>3.3.2</PackageVersion>
 		<Title>FmgLib.MauiMarkup.Template</Title>
 		<Authors>FmgYazılım</Authors>
 		<Description>C# Markup (No XAML) templates for .NET MAUI application with Hotreload process.</Description>
diff --git a/templates/FmgLib.MauiMarkup.TemplateApp/content/FmgLib.MauiMarkup.App/App.cs b/templates/FmgLib.MauiMarkup.TemplateApp/content/FmgLib.MauiMarkup.App/App.cs
@@ -5,7 +5,7 @@ public partial class App : Application
     public App()
     {
         this
-        .Resources(AppStyles.Default)
+        .Resources(new ResourceDictionary().MergedResources(AppStyles.Default))
         .MainPage(new AppShell());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace FmgLib.MauiMarkup;`
	`1`	`+using Microsoft.Maui.Controls.StyleSheets;`
	`2`	`+`
	`3`	`+namespace FmgLib.MauiMarkup;`
`2`	`4`
`3`	`5`	`public static partial class ApplicationExtension`
`4`	`6`	`{`
`@@ -99,6 +101,7 @@ public static T OnRequestedThemeChanged<T>(this T self, System.Action<T> action)`
`99`	`101`	`self.RequestedThemeChanged += (o, arg) => action(self);`
`100`	`102`	`return self;`
`101`	`103`	`}`
	`104`	`+`
`102`	`105`	`public static T MainPage<T>(this T self, Page? mainPage) where T : Application`
`103`	`106`	`{`
`104`	`107`	`self.MainPage = mainPage;`
`@@ -116,4 +119,10 @@ public static T UserAppTheme<T>(this T self, AppTheme userAppTheme) where T : Ap`
`116`	`119`	`self.UserAppTheme = userAppTheme;`
`117`	`120`	`return self;`
`118`	`121`	`}`
	`122`	`+`
	`123`	`+ public static T AccentColor<T>(this T self, Color accentColor) where T : Application`
	`124`	`+ {`
	`125`	`+ Application.AccentColor = accentColor;`
	`126`	`+ return self;`
	`127`	`+ }`
`119`	`128`	`}`