Finally a workaround the stupid CommandBar DataContext issues

Delete and Restore actions now work as intended
Renamed styles folder

ModernKeePass/Views/EntryDetailPage.xaml

@@ -273,44 +273,48 @@
                                 Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 Margin="{TemplateBinding BorderThickness}"
-                                Grid.ColumnSpan="3"
-                                Grid.RowSpan="1"/>
+                                Grid.ColumnSpan="3"/>
                             <Border x:Name="BorderElement"
-                                Grid.Row="1"
+                                Grid.Row="1" 
+                                Grid.Column="0" 
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
+                                Grid.ColumnSpan="3"/>
+                            <ContentPresenter 
+                                x:Name="HeaderContentPresenter"
+                                Grid.Row="0"
+                                Grid.Column="0" 
+                                Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
+                                Margin="0,4,0,4"
                                 Grid.ColumnSpan="3"
-                                Grid.RowSpan="1"/>
-                            <ContentPresenter x:Name="HeaderContentPresenter"
-                                          Grid.Row="0"
-                                          Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
-                                          Margin="0,4,0,4"
-                                          Grid.ColumnSpan="3"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          FontWeight="Semilight" />
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                FontWeight="Semilight" />
                             <ScrollViewer x:Name="ContentElement"
+                                Grid.Row="1" 
+                                Grid.Column="0"
+                                HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                Margin="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+                                IsTabStop="False"
+                                ZoomMode="Disabled"
+                                AutomationProperties.AccessibilityView="Raw"/>
+                            <ContentControl 
+                                x:Name="PlaceholderTextContentPresenter"
                                 Grid.Row="1"
-                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                                      Margin="{TemplateBinding BorderThickness}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsTabStop="False"
-                                      ZoomMode="Disabled"
-                                      AutomationProperties.AccessibilityView="Raw"/>
-                            <ContentControl x:Name="PlaceholderTextContentPresenter"
-                                      Grid.Row="1"
-                                      Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
-                                      Margin="{TemplateBinding BorderThickness}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsTabStop="False"
-                                      Grid.ColumnSpan="3"
-                                      Content="{TemplateBinding PlaceholderText}" 
-                                      IsHitTestVisible="False"/>
+                                Grid.Column="0"
+                                Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
+                                Margin="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+                                IsTabStop="False"
+                                Grid.ColumnSpan="3"
+                                Content="{TemplateBinding PlaceholderText}" 
+                                IsHitTestVisible="False"/>
                             <Button x:Name="RevealButton"
                                 Grid.Row="1"
                                 Style="{StaticResource RevealButtonStyle}"
@@ -367,9 +371,9 @@
             </Setter>
         </Style>
     </Page.Resources>
-    <Page.DataContext>
+    <!--<Page.DataContext>
         <viewModels:EntryVm />
-    </Page.DataContext>
+    </Page.DataContext>-->
     <Page.BottomAppBar>
         <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
             <CommandBar.SecondaryCommands>
@@ -380,7 +384,7 @@
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Save" x:Uid="AppBarSave" Command="{Binding SaveCommand}">
+                <AppBarButton Icon="Save" x:Uid="AppBarSave" Command="{Binding Path=SaveCommand}">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
@@ -405,14 +409,14 @@
             <AppBarButton Icon="Undo" x:Uid="AppBarRestore" Visibility="{Binding ParentGroup.IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Command="{Binding UndoDeleteCommand}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
-                        <actions:RestoreEntityAction Entity="{Binding}" Frame="{Binding Frame, ElementName=PageRoot}" />
+                        <actions:RestoreEntityAction Entity="{Binding}" Command="{Binding GoBackCommand}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>
             <AppBarButton Icon="Delete" x:Uid="AppBarDelete">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
-                        <actions:DeleteEntityAction Entity="{Binding}" Frame="{Binding Frame, ElementName=PageRoot}" />
+                        <actions:DeleteEntityAction Entity="{Binding}" Command="{Binding GoBackCommand}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>

ModernKeePass/Views/EntryDetailPage.xaml.cs

@@ -2,7 +2,6 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
-using ModernKeePass.Services;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Page Détail de l'élément, consultez la page http://go.microsoft.com/fwlink/?LinkId=234232
@@ -28,7 +27,7 @@ namespace ModernKeePass.Views
             InitializeComponent();
             NavigationHelper = new NavigationHelper(this);
         }
-
+        
         #region Inscription de NavigationHelper
 
         /// Les méthodes fournies dans cette section sont utilisées simplement pour permettre
@@ -45,6 +44,7 @@ namespace ModernKeePass.Views
             NavigationHelper.OnNavigatedTo(e);
             if (!(e.Parameter is EntryVm)) return;
             DataContext = (EntryVm)e.Parameter;
+            Model.GoBackCommand = NavigationHelper.GoBackCommand;
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)

ModernKeePass/Views/GroupDetailPage.xaml

@@ -66,14 +66,14 @@
             <AppBarButton Icon="Undo" x:Uid="AppBarRestore" Visibility="{Binding ShowRestore, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Command="{Binding UndoDeleteCommand}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
-                        <actions:RestoreEntityAction Entity="{Binding}" Frame="{Binding Frame, ElementName=PageRoot}" />
+                        <actions:RestoreEntityAction Entity="{Binding}" Command="{Binding GoBackCommand}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>
             <AppBarButton Icon="Delete" x:Uid="AppBarDelete" IsEnabled="{Binding IsNotRoot}" Visibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
-                        <actions:DeleteEntityAction Entity="{Binding}" Frame="{Binding Frame, ElementName=PageRoot}" />
+                        <actions:DeleteEntityAction Entity="{Binding}" Command="{Binding GoBackCommand}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>

ModernKeePass/Views/GroupDetailPage.xaml.cs

@@ -7,7 +7,6 @@ using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
 using ModernKeePass.Events;
-using ModernKeePass.Services;
 using ModernKeePass.ViewModels;
 
 // The Group Detail Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234229
@@ -57,6 +56,7 @@ namespace ModernKeePass.Views
                 if (vm != null)
                     DataContext = vm;
             }
+            Model.GoBackCommand = NavigationHelper.GoBackCommand;
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)