Skip to content

Commit 0e74c8c

Browse files
gonultasmfgonultasmf
authored
Merge pull request #145 from FmgLib/feature/v8.8.5
Feature/v8.8.5
2 parents 40a7784 + f79eb24 commit 0e74c8c

File tree

15 files changed

+88
-21
lines changed

15 files changed

+88
-21
lines changed

‎FmgLib.MauiMarkup.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FE0466FD-1CF3-4D08-B3B2-B6E0EB476831}"
99
ProjectSection(SolutionItems) = preProject
1010
LICENSE.txt = LICENSE.txt
11+
README.md = README.md
1112
TODO.txt = TODO.txt
1213
EndProjectSection
1314
EndProject

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ public partial class App : Application
765765
this.MainPage(
766766
new Shell()
767767
.ItemTemplate(() => new ShellItemTemplate())
768-
.Resources(AppResources.Default)
768+
.Resources(new ResourceDictionary().MergedDictionaries(AppStyles.Default))
769769
.Items(
770770
new FlyoutItem()
771771
.FlyoutDisplayOptions(FlyoutDisplayOptions.AsMultipleItems)

‎sample/DalluiApp/DalluiApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<ItemGroup>
8484
<PackageReference Include="CardsView.Maui" Version="0.0.9" />
8585
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
86-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
86+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
8787
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
8888
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
8989
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

‎sample/F1TV/F1TV.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<ItemGroup>
7676
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
77-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
77+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
7878
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
7979
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
8080
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

‎sample/FruitApp/FruitApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<ItemGroup>
7676
<PackageReference Include="AcrylicView.Maui" Version="2.1.3" />
77-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
77+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
7878
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
7979
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
8080
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

‎sample/Game2048/Game2048Maui.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ItemGroup>
7575
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
7676
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
77-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
77+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
7878
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.71" />
7979
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.71" />
8080
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

‎sample/GeneratedExam/GeneratedExam.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.1" />
11+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
1212
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
1313
<PackageReference Include="SkiaSharp.Extended.UI.Maui" Version="2.0.0" />
1414
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4.0" />

‎sample/MatchingImage/MatchingImage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</ItemGroup>
7878

7979
<ItemGroup>
80-
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.3" />
80+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
8181
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
8282
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
8383
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

‎sample/MyOrderApp/MyOrderApp.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,9 @@
6969
<None Remove="Resources\Images\white_bread.png" />
7070
<None Remove="Resources\Raw\completed.json" />
7171
</ItemGroup>
72+
7273
<ItemGroup>
73-
<ProjectReference Include="..\..\src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj" />
74-
</ItemGroup>
75-
<ItemGroup>
74+
<PackageReference Include="FmgLib.MauiMarkup" Version="8.*" />
7675
<PackageReference Include="AutoMapper" Version="13.0.1" />
7776
<PackageReference Include="LiteDB" Version="5.0.20" />
7877
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.*" Condition="'$(Configuration)' == 'Debug'" />

‎src/FmgLib.MauiMarkup/Extensions/ApplicationExtension.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace FmgLib.MauiMarkup;
1+
using Microsoft.Maui.Controls.StyleSheets;
2+
3+
namespace FmgLib.MauiMarkup;
24

35
public static partial class ApplicationExtension
46
{
@@ -99,6 +101,7 @@ public static T OnRequestedThemeChanged<T>(this T self, System.Action<T> action)
99101
self.RequestedThemeChanged += (o, arg) => action(self);
100102
return self;
101103
}
104+
102105
public static T MainPage<T>(this T self, Page? mainPage) where T : Application
103106
{
104107
self.MainPage = mainPage;
@@ -116,4 +119,10 @@ public static T UserAppTheme<T>(this T self, AppTheme userAppTheme) where T : Ap
116119
self.UserAppTheme = userAppTheme;
117120
return self;
118121
}
122+
123+
public static T AccentColor<T>(this T self, Color accentColor) where T : Application
124+
{
125+
Application.AccentColor = accentColor;
126+
return self;
127+
}
119128
}

‎src/FmgLib.MauiMarkup/Extensions/ResourceDictionaryExtension.cs

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,75 @@
22

33
public static partial class ResourceDictionaryExtension
44
{
5-
public static ResourceDictionary AddResource(this ResourceDictionary dic, string key, object value)
5+
public static T AddResource<T>(this T self, string key, object value) where T : Microsoft.Maui.Controls.ResourceDictionary
66
{
7-
dic.Add(key, value);
7+
self.Add(key, value);
88

9-
return dic;
9+
return self;
1010
}
1111

12-
public static ResourceDictionary RemoveResource(this ResourceDictionary dic, string key)
12+
public static T AddResource<T>(this T self, Style style) where T : Microsoft.Maui.Controls.ResourceDictionary
1313
{
14-
dic.Remove(key);
14+
self.Add(style);
1515

16-
return dic;
16+
return self;
17+
}
18+
19+
public static T AddResource<T>(this T self, Microsoft.Maui.Controls.StyleSheets.StyleSheet styleSheet) where T : Microsoft.Maui.Controls.ResourceDictionary
20+
{
21+
self.Add(styleSheet);
22+
23+
return self;
24+
}
25+
26+
public static T AddResource<T>(this T self, string strStyleSheet) where T : Microsoft.Maui.Controls.ResourceDictionary
27+
{
28+
self.Add(Microsoft.Maui.Controls.StyleSheets.StyleSheet.FromReader(new StringReader(strStyleSheet)));
29+
30+
return self;
31+
}
32+
33+
public static T AddResource<T>(this T self, ResourceDictionary mergedResourceDictionary) where T : Microsoft.Maui.Controls.ResourceDictionary
34+
{
35+
self.Add(mergedResourceDictionary);
36+
37+
return self;
38+
}
39+
40+
public static T RemoveResource<T>(this T self, string key) where T : Microsoft.Maui.Controls.ResourceDictionary
41+
{
42+
self.Remove(key);
43+
44+
return self;
45+
}
46+
47+
public static T MergedResources<T>(this T self, params ResourceDictionary[] resources) where T : Microsoft.Maui.Controls.ResourceDictionary
48+
{
49+
foreach (var resource in resources)
50+
{
51+
self.MergedDictionaries.Add(resource);
52+
}
53+
return self;
54+
}
55+
56+
public static T MergedResources<T>(this T self, IList<ResourceDictionary> resources) where T : Microsoft.Maui.Controls.ResourceDictionary
57+
{
58+
foreach (var resource in resources)
59+
{
60+
self.MergedDictionaries.Add(resource);
61+
}
62+
return self;
63+
}
64+
65+
public static T Source<T>(this T self, Uri uri) where T : Microsoft.Maui.Controls.ResourceDictionary
66+
{
67+
self.Source = uri;
68+
return self;
69+
}
70+
71+
public static T Source<T>(this T self, string url) where T : Microsoft.Maui.Controls.ResourceDictionary
72+
{
73+
self.Source = new Uri(url);
74+
return self;
1775
}
1876
}

‎src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageId>FmgLib.MauiMarkup</PackageId>
1212
<Summary>FmgLib.MauiMarkup with C# Markup classes and fluent helper methods</Summary>
1313
<Title>FmgLib.MauiMarkup</Title>
14-
<Version>8.8.4</Version>
14+
<Version>8.8.5</Version>
1515
<Authors>FmgYazılım</Authors>
1616
<Company>Fmg Yazılım</Company>
1717
<Copyright>©2024</Copyright>

‎src/FmgLib.MauiMarkup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ public partial class App : Application
765765
this.MainPage(
766766
new Shell()
767767
.ItemTemplate(() => new ShellItemTemplate())
768-
.Resources(AppResources.Default)
768+
.Resources(new ResourceDictionary().MergedDictionaries(AppStyles.Default))
769769
.Items(
770770
new FlyoutItem()
771771
.FlyoutDisplayOptions(FlyoutDisplayOptions.AsMultipleItems)

‎templates/FmgLib.MauiMarkup.TemplateApp/FmgLib.MauiMarkup.Template.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- The package metadata. Fill in the properties marked as TODO below -->
55
<!-- Follow the instructions on https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
66
<PackageId>FmgLib.MauiMarkup.Template</PackageId>
7-
<PackageVersion>3.3.1</PackageVersion>
7+
<PackageVersion>3.3.2</PackageVersion>
88
<Title>FmgLib.MauiMarkup.Template</Title>
99
<Authors>FmgYazılım</Authors>
1010
<Description>C# Markup (No XAML) templates for .NET MAUI application with Hotreload process.</Description>

‎templates/FmgLib.MauiMarkup.TemplateApp/content/FmgLib.MauiMarkup.App/App.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public partial class App : Application
55
public App()
66
{
77
this
8-
.Resources(AppStyles.Default)
8+
.Resources(new ResourceDictionary().MergedResources(AppStyles.Default))
99
.MainPage(new AppShell());
1010
}
1111
}

0 commit comments

Comments
 (0)