Merge pull request #108 from MykhailoDav/adding_appShell

Adding AppShell

samples/SampleApp/App.xaml.cs

@@ -10,23 +10,23 @@ public partial class App : Application
 
     public static new App Current => (App)Application.Current;
     public App(IThemeService themeService)
-	{
+    {
         this.themeService = themeService;
         InitializeComponent();
 
-        MainPage = new NavigationPage(new MainPage());
+        MainPage = new AppShell();
     }
-   
+
 
     protected override void OnStart()
     {
         themeService.SetTheme(AppTheme.Unspecified);
-    }   
+    }
 
     protected override void OnResume()
     {
 
     }
-  
+
 }
 

samples/SampleApp/AppShell.xaml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="SampleApp.AppShell"
+    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    Title="Calendar"
+    BackgroundColor="{toolkit:AppThemeResource ShellColor}"
+    FlyoutBackgroundColor="{toolkit:AppThemeResource BackgroundColorfullPageColor}"
+    xmlns:local="clr-namespace:SampleApp.Views;assembly=SampleApp"
+    Shell.TitleColor="{toolkit:AppThemeResource TextColor}"
+    Shell.FlyoutBehavior="Disabled">
+    <Shell.Resources>
+        <ResourceDictionary>
+            <toolkit:AppThemeColor
+                x:Key="ShellColor"
+                Dark="#FF243138"
+                Light="#FFE2E3D4"/>
+        </ResourceDictionary>
+    </Shell.Resources>
+    <TabBar>
+        <Tab Icon="calendar"
+             Title="MainPage">
+            <ShellContent
+                ContentTemplate="{DataTemplate local:MainPage}"
+                Route="MainPage"/>
+        </Tab>
+        <Tab Icon="settings"
+             Title="Settings">
+            <ShellContent
+                ContentTemplate="{DataTemplate local:UserSettingPage}"
+                Route="UserSettingPage"/>
+        </Tab>
+    </TabBar>
+</Shell>

samples/SampleApp/AppShell.xaml.cs

@@ -0,0 +1,21 @@
+using SampleApp.Views;
+
+namespace SampleApp;
+
+public partial class AppShell : Shell
+{
+	public AppShell()
+	{
+		InitializeComponent();
+
+		Routing.RegisterRoute(nameof(UserSettingPage), typeof(UserSettingPage));
+		Routing.RegisterRoute(nameof(SimplePage), typeof(SimplePage));
+		Routing.RegisterRoute(nameof(WeekendCalendarPage), typeof(WeekendCalendarPage));
+		Routing.RegisterRoute(nameof(MultiSelectionPage), typeof(MultiSelectionPage));
+		Routing.RegisterRoute(nameof(AdvancedPage), typeof(AdvancedPage));
+		Routing.RegisterRoute(nameof(RangeSelectionPage), typeof(RangeSelectionPage));
+		Routing.RegisterRoute(nameof(WeekViewPage), typeof(WeekViewPage));
+		Routing.RegisterRoute(nameof(TwoWeekViewPage), typeof(TwoWeekViewPage));
+		Routing.RegisterRoute(nameof(Windows11CalendarPage), typeof(Windows11CalendarPage));
+	}
+}

samples/SampleApp/Controls/ThemeButton.xaml

@@ -19,11 +19,11 @@
         <toolkit:AppThemeColor
             x:Key="CheeckedColor"
             Dark="#B3FCF8"
-            Light="#B3FCF8" />
+            Light="#2F3E46" />
         <toolkit:AppThemeColor
             x:Key="UncheckedColor"
             Dark="#2F3E46"
-            Light="#2F3E46" />
+            Light="#c2c5aa" />
     </ContentView.Resources>
 
     <RadioButton GroupName="{Binding GroupName, Source={x:Reference This}}" IsChecked="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}">

samples/SampleApp/Resources/Styles/Colors.xaml

@@ -63,6 +63,6 @@
         Light="#c2c5aa" />
     <toolkit:AppThemeColor
         x:Key="TextColor"
-        Dark="#B3FCF8"
+        Dark="#a3b18a"
         Light="#2F3E46" />
 </ResourceDictionary>

samples/SampleApp/Views/AdvancedPage.xaml

@@ -8,28 +8,39 @@
     xmlns:plugin="clr-namespace:Plugin.Maui.Calendar.Controls;assembly=Plugin.Maui.Calendar"
     xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     x:Name="advancedCalendarPage"
+    Shell.TabBarIsVisible="False"
     x:DataType="local:AdvancedPageViewModel"
     BackgroundColor="{toolkit:AppThemeResource BackgroundColor}"
     Unloaded="UnloadedHandler">
     <ContentPage.Resources>
         <ResourceDictionary>
-            <Style x:Key="daysLabelStyle" TargetType="Label">
-                <Setter Property="HorizontalTextAlignment" Value="Center" />
-                <Setter Property="TextColor" Value="Black" />
-                <Setter Property="FontSize" Value="Medium" />
-                <Setter Property="LineBreakMode" Value="WordWrap" />
-                <Setter Property="VerticalTextAlignment" Value="Center" />
-                <Setter Property="Margin" Value="5,2" />
+            <Style x:Key="daysLabelStyle"
+                   TargetType="Label">
+                <Setter Property="HorizontalTextAlignment"
+                        Value="Center"/>
+                <Setter Property="TextColor"
+                        Value="Black"/>
+                <Setter Property="FontSize"
+                        Value="Medium"/>
+                <Setter Property="LineBreakMode"
+                        Value="WordWrap"/>
+                <Setter Property="VerticalTextAlignment"
+                        Value="Center"/>
+                <Setter Property="Margin"
+                        Value="5,2"/>
             </Style>
-            <Style x:Key="daysTitleLabelStyle" TargetType="Label">
-                <Setter Property="FontSize" Value="18" />
-                <Setter Property="FontFamily" Value="OpenSansSemibold" />
+            <Style x:Key="daysTitleLabelStyle"
+                   TargetType="Label">
+                <Setter Property="FontSize"
+                        Value="18"/>
+                <Setter Property="FontFamily"
+                        Value="OpenSansSemibold"/>
             </Style>
         </ResourceDictionary>
     </ContentPage.Resources>
 
     <ContentPage.BindingContext>
-        <local:AdvancedPageViewModel />
+        <local:AdvancedPageViewModel/>
     </ContentPage.BindingContext>
 
 
@@ -77,18 +88,18 @@
         YearLabelColor="Blue">
 
         <plugin:Calendar.HeaderSectionTemplate>
-            <controls:CalendarHeader />
+            <controls:CalendarHeader/>
         </plugin:Calendar.HeaderSectionTemplate>
 
         <plugin:Calendar.FooterSectionTemplate>
             <DataTemplate>
-                <controls:CalendarFooter />
+                <controls:CalendarFooter/>
             </DataTemplate>
         </plugin:Calendar.FooterSectionTemplate>
 
         <plugin:Calendar.EventTemplate>
             <DataTemplate>
-                <controls:CalenderEvent CalenderEventCommand="{Binding BindingContext.EventSelectedCommand, Source={x:Reference advancedCalendarPage}}" />
+                <controls:CalenderEvent CalenderEventCommand="{Binding BindingContext.EventSelectedCommand, Source={x:Reference advancedCalendarPage}}"/>
             </DataTemplate>
         </plugin:Calendar.EventTemplate>
         <plugin:Calendar.EmptyTemplate>
@@ -97,7 +108,7 @@
                     <Label
                         Margin="0,5,0,5"
                         HorizontalTextAlignment="Center"
-                        Text="NO EVENTS FOR THE SELECTED DATE" />
+                        Text="NO EVENTS FOR THE SELECTED DATE"/>
                 </VerticalStackLayout>
             </DataTemplate>
         </plugin:Calendar.EmptyTemplate>

samples/SampleApp/Views/DefaultDeviceCalendars/Windows11CalendarPage.xaml

@@ -8,6 +8,7 @@
     xmlns:plugin="clr-namespace:Plugin.Maui.Calendar.Controls;assembly=Plugin.Maui.Calendar"
     xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     x:Name="windowsCalendarPage"
+    Shell.TabBarIsVisible="False"
     Title="Windows 11 Calendar"
     x:DataType="local:Windows11CalendarViewModel">
 
@@ -16,28 +17,31 @@
             <toolkit:AppThemeColor
                 x:Key="WindowsThemeColor"
                 Dark="#04e762"
-                Light="#2b9348" />
+                Light="#2b9348"/>
             <toolkit:AppThemeColor
                 x:Key="TodayDayLabelTextColor"
                 Dark="Black"
-                Light="White" />
+                Light="White"/>
             <toolkit:AppThemeObject
                 x:Key="Walpaper"
                 Dark="windows_walpaper_dark.png"
-                Light="windows_walpaper_light.png" />
-            <Style x:Key="DaysLabelStyle" TargetType="Label">
-                <Setter Property="TextColor" Value="Red" />
+                Light="windows_walpaper_light.png"/>
+            <Style x:Key="DaysLabelStyle"
+                   TargetType="Label">
+                <Setter Property="TextColor"
+                        Value="Red"/>
             </Style>
         </ResourceDictionary>
     </ContentPage.Resources>
 
 
     <ContentPage.BindingContext>
-        <local:Windows11CalendarViewModel />
+        <local:Windows11CalendarViewModel/>
     </ContentPage.BindingContext>
 
     <Grid>
-        <Image Aspect="AspectFill" Source="{toolkit:AppThemeResource Walpaper}" />
+        <Image Aspect="AspectFill"
+               Source="{toolkit:AppThemeResource Walpaper}"/>
         <Border
             Margin="30"
             BackgroundColor="{toolkit:AppThemeResource BackgroundColor}"
@@ -54,7 +58,7 @@
                     Brush="Black"
                     Opacity="0.1"
                     Radius="2"
-                    Offset="0,4" />
+                    Offset="0,4"/>
             </Border.Shadow>
             <plugin:Calendar
                 x:Name="calendar"
@@ -76,7 +80,7 @@
 
                 <plugin:Calendar.HeaderSectionTemplate>
                     <DataTemplate>
-                        <controls:Windows11CalendarHeader />
+                        <controls:Windows11CalendarHeader/>
                     </DataTemplate>
                 </plugin:Calendar.HeaderSectionTemplate>
             </plugin:Calendar>