-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from RadekVyM/dev
Core 5.1.0
- Loading branch information
Showing
72 changed files
with
479 additions
and
440 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,37 @@ | ||
| using SimpleToolkit.Core; | ||
| using SimpleToolkit.SimpleShell; | ||
| #if IOS || MACCATALYST | ||
| using CommunityToolkit.Maui.Views; | ||
| #endif | ||
|
|
||
| namespace Playground.Original | ||
| namespace Playground.Original; | ||
|
|
||
| public static class MauiProgram | ||
| { | ||
| public static class MauiProgram | ||
| { | ||
| internal const AppShellType UsedAppShell = AppShellType.Playground; | ||
| internal const AppShellType UsedAppShell = AppShellType.Playground; | ||
|
|
||
| public static MauiApp CreateMauiApp() | ||
| { | ||
| var builder = MauiApp.CreateBuilder(); | ||
| public static MauiApp CreateMauiApp() | ||
| { | ||
| var builder = MauiApp.CreateBuilder(); | ||
|
|
||
| builder.UseMauiApp<App>() | ||
| .UseSimpleToolkit() | ||
| .ConfigureFonts(fonts => | ||
| { | ||
| fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); | ||
| fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); | ||
| fonts.AddFont("Font-Awesome-Solid.otf", "FontAwesomeSolid"); | ||
| }); | ||
| builder.UseMauiApp<App>() | ||
| .UseSimpleToolkit() | ||
| .ConfigureFonts(fonts => | ||
| { | ||
| fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); | ||
| fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); | ||
| fonts.AddFont("Font-Awesome-Solid.otf", "FontAwesomeSolid"); | ||
| }); | ||
|
|
||
| if (UsedAppShell == AppShellType.Playground) | ||
| builder.DisplayContentBehindBars(); | ||
| if (UsedAppShell == AppShellType.Playground) | ||
| builder.DisplayContentBehindBars(); | ||
|
|
||
| #if ANDROID | ||
| builder.SetDefaultStatusBarAppearance(color: Colors.Transparent, lightElements: false); | ||
| builder.SetDefaultNavigationBarAppearance(color: Colors.Transparent, lightElements: false); | ||
| builder.SetDefaultStatusBarAppearance(color: Colors.Transparent, lightElements: false); | ||
| builder.SetDefaultNavigationBarAppearance(color: Colors.Transparent, lightElements: false); | ||
| #endif | ||
| if (UsedAppShell is not AppShellType.Normal) | ||
| { | ||
| builder.UseSimpleShell(true); | ||
| } | ||
|
|
||
| return builder.Build(); | ||
| if (UsedAppShell is not AppShellType.Normal) | ||
| { | ||
| builder.UseSimpleShell(true); | ||
| } | ||
|
|
||
| return builder.Build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 12 additions & 13 deletions
25
src/Playground/Playground.Original/NormalAppShell.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,18 @@ | ||
| using Playground.Original.Views.Pages; | ||
|
|
||
| namespace Playground.Original | ||
| namespace Playground.Original; | ||
|
|
||
| public partial class NormalAppShell : Shell | ||
| { | ||
| public partial class NormalAppShell : Shell | ||
| public NormalAppShell() | ||
| { | ||
| public NormalAppShell() | ||
| { | ||
| InitializeComponent(); | ||
| InitializeComponent(); | ||
|
|
||
| Routing.RegisterRoute(nameof(ImagePage), typeof(ImagePage)); | ||
| Routing.RegisterRoute(nameof(FirstYellowDetailPage), typeof(FirstYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(SecondYellowDetailPage), typeof(SecondYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(ThirdYellowDetailPage), typeof(ThirdYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(FourthYellowDetailPage), typeof(FourthYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(FirstGreenDetailPage), typeof(FirstGreenDetailPage)); | ||
| } | ||
| Routing.RegisterRoute(nameof(ImagePage), typeof(ImagePage)); | ||
| Routing.RegisterRoute(nameof(FirstYellowDetailPage), typeof(FirstYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(SecondYellowDetailPage), typeof(SecondYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(ThirdYellowDetailPage), typeof(ThirdYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(FourthYellowDetailPage), typeof(FourthYellowDetailPage)); | ||
| Routing.RegisterRoute(nameof(FirstGreenDetailPage), typeof(FirstGreenDetailPage)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.