Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/new system #121

Merged
merged 10 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,6 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd
/templates/FmgLib.MauiMarkup.TemplateApp/bin/*
/templates/FmgLib.MauiMarkup.TemplateApp/obj/*
39 changes: 23 additions & 16 deletions FmgLib.MauiMarkup.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ VisualStudioVersion = 17.9.34414.90
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{A4956394-4BE4-4C5A-BDD3-59F439A1FD98}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{8254CDF2-DB64-4ED2-8305-85CB3461710E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup", "libs\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj", "{7FE9B834-EEF6-4D65-8EE8-B085997B1F26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FE0466FD-1CF3-4D08-B3B2-B6E0EB476831}"
ProjectSection(SolutionItems) = preProject
LICENSE.txt = LICENSE.txt
Expand All @@ -19,30 +15,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneratedExam", "sample\Gen
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8E033618-BADE-4A6C-AC14-56EF722D8F61}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup.Generator.Test", "tests\FmgLib.MauiMarkup.Generator.Test\FmgLib.MauiMarkup.Generator.Test.csproj", "{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyOrderApp", "sample\MyOrderApp\MyOrderApp.csproj", "{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyFinance", "sample\MyFinance\MyFinance.csproj", "{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9F405AEA-B646-47DD-A094-B4DA5F087273}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup", "src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj", "{D2A04B78-1200-47E4-8DD4-F36BBB31B323}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup.Generator", "src\FmgLib.MauiMarkup.Generator\FmgLib.MauiMarkup.Generator.csproj", "{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup.Generator.Test", "tests\FmgLib.MauiMarkup.Generator.Test\FmgLib.MauiMarkup.Generator.Test.csproj", "{DAC53472-0370-4B41-8A21-ECB0B8BD660C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FE9B834-EEF6-4D65-8EE8-B085997B1F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7FE9B834-EEF6-4D65-8EE8-B085997B1F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FE9B834-EEF6-4D65-8EE8-B085997B1F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FE9B834-EEF6-4D65-8EE8-B085997B1F26}.Release|Any CPU.Build.0 = Release|Any CPU
{61CFBCD6-A21C-46CA-8264-5F21A0467F18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61CFBCD6-A21C-46CA-8264-5F21A0467F18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61CFBCD6-A21C-46CA-8264-5F21A0467F18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61CFBCD6-A21C-46CA-8264-5F21A0467F18}.Release|Any CPU.Build.0 = Release|Any CPU
{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B}.Release|Any CPU.Build.0 = Release|Any CPU
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand All @@ -55,16 +49,29 @@ Global
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.Build.0 = Release|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Release|Any CPU.Build.0 = Release|Any CPU
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D}.Release|Any CPU.Build.0 = Release|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{7FE9B834-EEF6-4D65-8EE8-B085997B1F26} = {8254CDF2-DB64-4ED2-8305-85CB3461710E}
{61CFBCD6-A21C-46CA-8264-5F21A0467F18} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{57DB4E88-894E-46B4-A6FA-6BD3630BEB4B} = {8E033618-BADE-4A6C-AC14-56EF722D8F61}
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{D2A04B78-1200-47E4-8DD4-F36BBB31B323} = {9F405AEA-B646-47DD-A094-B4DA5F087273}
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D} = {9F405AEA-B646-47DD-A094-B4DA5F087273}
{DAC53472-0370-4B41-8A21-ECB0B8BD660C} = {8E033618-BADE-4A6C-AC14-56EF722D8F61}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2698E1E7-D253-457B-AF1B-6754123E0A11}
Expand Down
39 changes: 20 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
### Free .NET MAUI Libraries by FmgLib


| NuGet Package | Link | Repo Info |
|--------------|------|-------|
| `FmgLib.MauiMarkup` | [![NuGet](https://buildstats.info/nuget/FmgLib.MauiMarkup?includePreReleases=true)](https://www.nuget.org/packages/FmgLib.MauiMarkup/) | [![GitHub Stars](https://img.shields.io/github/stars/FmgLib/FmgLib.MauiMarkup?style=flat-square&color=blue)](https://github.com/FmgLib/FmgLib.MauiMarkup/stargazers) [![GitHub Forks](https://img.shields.io/github/forks/FmgLib/FmgLib.MauiMarkup?style=flat-square&color=green)](https://github.com/FmgLib/FmgLib.MauiMarkup/forks) [![GitHub last-commit](https://img.shields.io/github/last-commit/FmgLib/FmgLib.MauiMarkup?style=flat-square)](https://github.com/FmgLib/FmgLib.MauiMarkup/commits) |
| `FmgLib.MauiMarkup.Template` | [![NuGet](https://buildstats.info/nuget/FmgLib.MauiMarkup.Template?includePreReleases=true)](https://www.nuget.org/packages/FmgLib.MauiMarkup.Template/) | - |


### Free .NET MAUI Project Templates by FmgLib

| Template | Link |
|--------------|------|
| `FmgLib .NET MAUI Markup App` | [![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/r/FmgLib.FmgLibMauiMarkupTemplate)](https://marketplace.visualstudio.com/items?itemName=FmgLib.FmgLibMauiMarkupTemplate&ssr=false#overview) [![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/i/FmgLib.FmgLibMauiMarkupTemplate)](https://marketplace.visualstudio.com/items?itemName=FmgLib.FmgLibMauiMarkupTemplate&ssr=false#overview)|



# Getting Started

### Creating a new FmgLib.MauiMarkup project from CLI
Expand Down Expand Up @@ -132,7 +115,6 @@ This would set the `AbsoluteLayout.LayoutBounds` attached property to the specif

| Maui bağlı özelliği | FmgLib.MauiMarkup metodu |
|-|-|
|`Shell.ItemTemplate`|`ShellItemTemplate()`|
|`FlyoutBase.ContextFlyout`|`ContextFlyout()`|
|`Grid.Column`|`Column()`|
|`Grid.Row`|`Row()`|
Expand All @@ -148,16 +130,35 @@ This would set the `AbsoluteLayout.LayoutBounds` attached property to the specif
|`BindableLayout.ItemTemplate`|`BindableLayoutItemTemplate()`|
|`BindableLayout.TemplateSelector`|`BindableItemTemplateSelector()`|
|`Shell.PresentationMode`|`ShellPresentationMode()`|
|`ShellBackgroundColor`|`ShellBackgroundColor()`|
|`Shell.BackgroundColor`|`ShellBackgroundColor()`|
|`Shell.ForegroundColor`|`ShellForegroundColor()`|
|`Shell.TitleColor`|`ShellTitleColor()`|
|`Shell.DisabledColor`|`ShellDisabledColor()`|
|`Shell.UnselectedColor`|`ShellUnselectedColor()`|
|`Shell.NavBarHasShadow`|`ShellNavBarHasShadow()`|
|`Shell.NavBarIsVisible`|`ShellNavBarIsVisible()`|
|`Shell.TitleView`|`ShellTitleView()`|
|`Shell.TabBarBackgroundColor`|`ShellTabBarBackgroundColor()`|
|`Shell.TabBarForegroundColor`|`ShellTabBarForegroundColor()`|
|`Shell.TabBarTitleColor`|`ShellTabBarTitleColor()`|
|`Shell.TabBarDisabledColor`|`ShellTabBarDisabledColor()`|
|`Shell.TabBarUnselectedColor`|`ShellTabBarUnselectedColor()`|
|`Shell.TabBarIsVisible`|`ShellTabBarIsVisible()`|
|`Shell.FlyoutBackdrop`|`ShellFlyoutBackdrop()`|
|`Shell.FlyoutBehavior`|`ShellFlyoutBehavior()`|
|`Shell.FlyoutHeight`|`ShellFlyoutHeight()`|
|`Shell.FlyoutWidth`|`ShellFlyoutWidth()`|
|`Shell.FlyoutItemIsVisible`|`ShellFlyoutItemIsVisible()`|
|`Shell.BackButtonBehavior`|`ShellBackButtonBehavior()`|
|`Shell.ItemTemplate`|`ShellItemTemplate()`|
|`Shell.MenuItemTemplate`|`ShellMenuItemTemplate()`|
|`Shell.SearchHandler`|`ShellSearchHandler()`|
|`NavigationPage.HasNavigationBar`|`NavigationPageHasNavigationBar()`|
|`NavigationPage.BackButtonTitle`|`NavigationPageBackButtonTitle()`|
|`NavigationPage.HasBackButton`|`NavigationPageHasBackButton()`|
|`NavigationPage.IconColor`|`NavigationPageIconColor()`|
|`NavigationPage.TitleIconImageSource`|`NavigationPageTitleIconImageSource()`|
|`NavigationPage.TitleView`|`NavigationPageTitleView()`|
|`SemanticProperties.Hint`|`SemanticHint()`|
|`SemanticProperties.Description`|`SemanticDescription()`|
|`SemanticProperties.HeadingLevel`|`SemanticHeadingLevel()`|
Expand Down
2 changes: 1 addition & 1 deletion sample/MyFinance/MyFinance.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="DevExpress.Maui.Controls" Version="23.2.6" />
<PackageReference Include="DevExpress.Maui.Editors" Version="23.2.6" />
<PackageReference Include="FmgLib.MauiMarkup" Version="8.5.0" />
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.0" />
<PackageReference Include="LiveChartsCore.SkiaSharpView.Maui" Version="2.0.0-rc2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
Expand Down
4 changes: 2 additions & 2 deletions sample/MyFinance/Views/AddOrEditPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public override void Build()
.PickerButtonAreaTemplate(() =>
new HorizontalStackLayout()
.Margin(10)
.AlignBottomEnd()
.AlignBottomRight()
.Spacing(10)
.Children(
new Button()
Expand All @@ -57,7 +57,7 @@ public override void Build()

new CheckEdit()
.Label("Gelir")
.AlignStart()
.AlignLeft()
.IsChecked(e => e.Path("OperationItem.IsIncome")),

new Button()
Expand Down
4 changes: 2 additions & 2 deletions sample/MyFinance/Views/ChartPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ public override void Build()
.TextColor(Green)
.FontSize(12)
.Column(1)
.AlignBottomEnd(),
.AlignBottomRight(),

new Label()
.Text(e => e.Path("TotalExpense"))
.TextColor(Red)
.FontSize(12)
.Column(1)
.Row(1)
.AlignTopEnd()
.AlignTopRight()
)
),

Expand Down
Loading