1 files changed, 26 insertions, 10 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 2b4c68060..524550b94 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -8,14 +8,28 @@
 			 xmlns:fa="http://schemas.fontawesome.io/icons/"
 			 xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels"
 			 xmlns:global="clr-namespace:Tango.PPC.UI"
+             xmlns:localConverters="clr-namespace:Tango.PPC.UI.Converters"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
 			 xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
 			 xmlns:keyboard="clr-namespace:Tango.Touch.Keyboard;assembly=Tango.Touch"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:LayoutViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.LayoutViewVM}">
 
-    <Grid>
-        <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}">
+    <UserControl.Resources>
+        <localConverters:NotificationItemConverter x:Key="NotificationItemConverter" />
+    </UserControl.Resources>
+
+    <touch:TouchNotificationBar HasNotifications="{Binding NotificationProvider.HasNotificationItems}" Notifications="{Binding NotificationProvider.NotificationItems}">
+        <touch:TouchNotificationBar.NotificationTemplate>
+            <DataTemplate>
+                <Grid>
+                    <ContentControl Content="{Binding Converter={StaticResource NotificationItemConverter}}" />
+                    <touch:TouchIconButton Background="Transparent" Padding="20" Style="{StaticResource TangoRoundTouchIconButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.NotificationProvider.PopNotificationCommand}" CommandParameter="{Binding}" HorizontalAlignment="Right" Width="60" Icon="Close" Foreground="White" />
+                </Grid>
+            </DataTemplate>
+        </touch:TouchNotificationBar.NotificationTemplate>
+
+        <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1">
             <touch:TouchSideMenu.MenuContent>
                 <Border x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
                     <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
@@ -59,7 +73,7 @@
                                     </StackPanel>
                                 </touch:TouchButton>
                             </StackPanel>
-                            
+
                             <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}" Margin="0 20 0 0">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
@@ -98,11 +112,13 @@
                             </touch:TouchHamburgerButton>
                         </Border>
                         <Grid>
-                            <StackPanel HorizontalAlignment="Right" Margin="30 0" Orientation="Horizontal">
-                                <touch:TouchButton Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20">
-                                    DYE
-                                </touch:TouchButton>
-                            </StackPanel>
+                            <DockPanel>
+                                <StackPanel DockPanel.Dock="Right" HorizontalAlignment="Right" Margin="30 0" Orientation="Horizontal">
+                                    <touch:TouchButton Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20">
+                                        DYE
+                                    </touch:TouchButton>
+                                </StackPanel>
+                            </DockPanel>
                         </Grid>
                     </DockPanel>
                 </Border>
@@ -111,12 +127,12 @@
                     <Grid>
                         <keyboard:KeyboardView>
                             <controls:NavigationControl x:Name="NavigationControl" x:FieldModifier="public" TransitionAlwaysFades="False" TransitionType="Zoom">
-                                
+
                             </controls:NavigationControl>
                         </keyboard:KeyboardView>
                     </Grid>
                 </Grid>
             </DockPanel>
         </touch:TouchSideMenu>
-    </Grid>
+    </touch:TouchNotificationBar>
 </UserControl>