Drag drop finally works

WIP item background
New Donate page stub
Renamed some classes as services

ModernKeePass/Pages/EntryDetailPage.xaml.cs

@@ -4,6 +4,7 @@ using Windows.UI.Xaml;
 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
@@ -76,9 +77,9 @@ namespace ModernKeePass.Pages
                 ? "Are you sure you want to send this entry to the recycle bin?"
                 : "Are you sure you want to delete this entry?";
             var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
-            MessageDialogHelper.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
+            MessageDialogService.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
             {
-                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                ToastNotificationService.ShowMovedToast(Model, "Deleting", text);
                 Model.MarkForDelete();
                 if (Frame.CanGoBack) Frame.GoBack();
             });
@@ -86,7 +87,7 @@ namespace ModernKeePass.Pages
 
         private void RestoreButton_Click(object sender, RoutedEventArgs e)
         {
-            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            ToastNotificationService.ShowMovedToast(Model, "Restored", "Item returned to its original group");
             if (Frame.CanGoBack) Frame.GoBack();
         }
 
@@ -99,7 +100,7 @@ namespace ModernKeePass.Pages
             }
             catch (Exception ex)
             {
-                MessageDialogHelper.ShowErrorDialog(ex);
+                MessageDialogService.ShowErrorDialog(ex);
             }
         }
     }

ModernKeePass/Pages/GroupDetailPage.xaml

@@ -106,7 +106,7 @@
                 DataContext="{Binding DataContext, ElementName=PageRoot}" 
                 RequestedTheme="Dark"
                 Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
+                Foreground="{ThemeResource DefaultTextForegroundThemeBrush}" AllowDrop="True" Drop="LeftListView_Drop">
                 <ListView.Resources>
                     <DataTemplate x:Name="Collapsed">
                         <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
@@ -167,9 +167,12 @@
                         TabIndex="1"
                         SelectionChanged="entries_SelectionChanged"
                         IsSynchronizedWithCurrentItem="False" 
-                        AllowDrop="{Binding IsEditMode}"
-                        CanReorderItems="{Binding IsEditMode}" 
-                        CanDragItems="{Binding IsEditMode}">
+                        BorderBrush="{StaticResource ListViewItemSelectedBackgroundThemeBrush}"
+                        AllowDrop="True"
+                        CanReorderItems="True" 
+                        CanDragItems="True"
+                        DragItemsStarting="GridView_DragItemsStarting" 
+                        Drop="GridView_Drop">
                         <interactivity:Interaction.Behaviors>
                             <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="False">
                                 <actions:SetupFocusAction TargetObject="{Binding ElementName=GridView}" />
@@ -177,22 +180,16 @@
                         </interactivity:Interaction.Behaviors>
                         <GridView.ItemTemplate>
                             <DataTemplate>
-                                <Grid Height="110" Width="480" x:Name="EntryGrid" >
+                                <Grid Height="110" Width="480" x:Name="EntryGrid" Background="{Binding BackgroundColor, ConverterParameter={StaticResource AppBarBackgroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <Border 
-                                        Grid.Column="0" 
-                                        BorderThickness="2" 
-                                        BorderBrush="{StaticResource SystemColor}"
-                                        Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}">
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" >
-                                            <SymbolIcon.RenderTransform>
-                                                <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
-                                            </SymbolIcon.RenderTransform>
-                                        </SymbolIcon>
-                                    </Border>
+                                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" >
+                                        <SymbolIcon.RenderTransform>
+                                            <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
+                                        </SymbolIcon.RenderTransform>
+                                    </SymbolIcon>
                                     <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
                                         <TextBlock x:Name="NameTextBlock" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
                                         <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
@@ -260,8 +257,36 @@
                                 OtherItem="{StaticResource GroupOtherItem}" />
                         </GridView.ItemTemplateSelector>-->
                         <GridView.ItemContainerStyle>
-                            <Style TargetType="FrameworkElement">
+                            <!--<Style TargetType="FrameworkElement">
                                 <Setter Property="Margin" Value="52,0,0,2"/>
+                            </Style>-->
+                            <Style TargetType = "GridViewItem" >
+                                <Setter Property = "Template" >
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType = "GridViewItem" >
+                                            <GridViewItemPresenter
+                                                SelectionCheckMarkVisualEnabled="True"
+                                                CheckHintBrush="{ThemeResource ListViewItemCheckHintThemeBrush}"
+                                                CheckSelectingBrush="{ThemeResource ListViewItemCheckSelectingThemeBrush}"
+                                                CheckBrush="{ThemeResource ListViewItemCheckThemeBrush}"
+                                                DragBackground="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"
+                                                DragForeground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
+                                                FocusBorderBrush="{ThemeResource ListViewItemFocusBorderThemeBrush}"
+                                                PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"
+                                                PointerOverBackground="{ThemeResource ListViewItemPointerOverBackgroundThemeBrush}"
+                                                SelectedBorderThickness="{ThemeResource GridViewItemCompactSelectedBorderThemeThickness}"
+                                                SelectedBackground="{ThemeResource ListViewItemSelectedBackgroundThemeBrush}"
+                                                SelectedForeground="{ThemeResource ListViewItemSelectedForegroundThemeBrush}"
+                                                SelectedPointerOverBackground="{ThemeResource ListViewItemSelectedPointerOverBackgroundThemeBrush}"
+                                                SelectedPointerOverBorderBrush="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}"
+                                                DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
+                                                DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
+                                                ReorderHintOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                                PointerOverBackgroundMargin="1"
+                                                ContentMargin="4" />
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
                             </Style>
                         </GridView.ItemContainerStyle>
                     </GridView>
@@ -342,5 +367,23 @@
             </StackPanel>
             <SearchBox Grid.Column="2" x:Uid="GroupSearch" Width="350" Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" BorderThickness="0" FontSize="18" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False" ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
         </Grid>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="DragDropGroup">
+                <VisualState x:Name="Dragging">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GridView" Storyboard.TargetProperty="BorderThickness">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="2"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Dropped">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GridView" Storyboard.TargetProperty="BorderThickness">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

ModernKeePass/Pages/GroupDetailPage.xaml.cs

@@ -6,6 +6,7 @@ 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
@@ -113,9 +114,9 @@ namespace ModernKeePass.Pages
                 ? "Are you sure you want to send the whole group and all its entries to the recycle bin?"
                 : "Are you sure you want to delete the whole group and all its entries?";
             var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
-            MessageDialogHelper.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
+            MessageDialogService.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
             {
-                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                ToastNotificationService.ShowMovedToast(Model, "Deleting", text);
                 Model.MarkForDelete();
                 if (Frame.CanGoBack) Frame.GoBack();
             });
@@ -123,7 +124,7 @@ namespace ModernKeePass.Pages
 
         private void RestoreButton_Click(object sender, RoutedEventArgs e)
         {
-            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            ToastNotificationService.ShowMovedToast(Model, "Restored", "Item returned to its original group");
             if (Frame.CanGoBack) Frame.GoBack();
         }
 
@@ -158,5 +159,19 @@ namespace ModernKeePass.Pages
         {
             Frame.Navigate(typeof(EntryDetailPage), Model.AddNewEntry());
         }
+
+        private void GridView_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
+        {
+            e.Cancel = !Model.IsEditMode;
+        }
+
+        private void GridView_Drop(object sender, DragEventArgs e)
+        {
+        }
+        
+        private void LeftListView_Drop(object sender, DragEventArgs e)
+        {
+
+        }
     }
 }

ModernKeePass/Pages/MainPageFrames/DonatePage.xaml

@@ -0,0 +1,14 @@
+<Page
+    x:Class="ModernKeePass.Pages.MainPageFrames.DonatePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <TextBlock x:Uid="DonateDesc" />
+        <RadioButton GroupName="DonateOptions"  />
+        <Button x:Uid="DonateButton" />
+    </StackPanel>
+</Page>

ModernKeePass/Pages/MainPageFrames/DonatePage.xaml.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ModernKeePass.Pages.MainPageFrames
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class DonatePage : Page
+    {
+        public DonatePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}

ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml

@@ -19,11 +19,11 @@
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <ToggleSwitch x:Uid="SettingsDatabaseRecycleBin" IsOn="{Binding HasRecycleBin, Mode=TwoWay}" />
         <ComboBox ItemsSource="{Binding Source={StaticResource RecycleBinGroups}}" SelectedItem="{Binding SelectedItem, Mode=TwoWay}" IsEnabled="{Binding HasRecycleBin}" />
-        <TextBlock x:Uid="SettingsDatabaseEncryption" FontSize="14" Margin="5,20,0,10" />
+        <TextBlock x:Uid="SettingsDatabaseEncryption" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,20,0,10" />
         <ComboBox ItemsSource="{Binding Source={StaticResource Ciphers}}" SelectedIndex="{Binding CipherIndex, Mode=TwoWay}" />
-        <TextBlock x:Uid="SettingsDatabaseCompression" FontSize="14" Margin="5,20,0,10" />
+        <TextBlock x:Uid="SettingsDatabaseCompression" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,20,0,10" />
         <ComboBox ItemsSource="{Binding Source={StaticResource Compressions}}" SelectedItem="{Binding CompressionName, Mode=TwoWay}" />
-        <TextBlock x:Uid="SettingsDatabaseKdf" FontSize="14" Margin="5,20,0,10" />
+        <TextBlock x:Uid="SettingsDatabaseKdf" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,20,0,10" />
         <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding KeyDerivationName, Mode=TwoWay}" />
     </StackPanel>
 </Page>

ModernKeePass/Pages/SettingsPageFrames/SettingsNewDatabasePage.xaml

@@ -8,15 +8,15 @@
     mc:Ignorable="d">
 
     <Page.Resources>
-        <CollectionViewSource x:Name="KeyDerivations" Source="{Binding KeyDerivations}" />
+        <CollectionViewSource x:Name="KeyDerivations" Source="{Binding FileFormats}" />
     </Page.Resources>
     <Page.DataContext>
         <viewModels:SettingsNewVm />
     </Page.DataContext>
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock x:Uid="SettingsNewDatabaseDesc" FontSize="14" />
+        <TextBlock x:Uid="SettingsNewDatabaseDesc" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,0,0,10"/>
         <ToggleSwitch x:Uid="SettingsNewDatabaseSample" IsOn="{Binding IsCreateSample, Mode=TwoWay}" />
-        <TextBlock x:Uid="SettingsNewDatabaseKdf" FontSize="14" />
-        <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding KeyDerivationName, Mode=TwoWay}" />
+        <TextBlock x:Uid="SettingsNewDatabaseKdf" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,20,0,10" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding FileFormatVersion, Mode=TwoWay}" />
     </StackPanel>
 </Page>

ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml

@@ -8,7 +8,7 @@
     mc:Ignorable="d">
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock x:Uid="SettingsSecurityTitle" FontSize="14" Margin="5,0,0,0" />
+        <TextBlock x:Uid="SettingsSecurityTitle" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,0,0,0" />
         <TextBlock TextWrapping="WrapWholeWords" Margin="5,0,0,0">
             <Run x:Uid="SettingsSecurityDesc1" />
             <Run x:Uid="SettingsSecurityDesc2" FontWeight="SemiBold" />

ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml.cs

@@ -2,6 +2,7 @@
 
 using ModernKeePass.Common;
 using ModernKeePass.Events;
+using ModernKeePass.Services;
 
 namespace ModernKeePass.Pages
 {
@@ -17,7 +18,7 @@ namespace ModernKeePass.Pages
 
         private void CompositeKeyUserControl_OnValidationChecked(object sender, PasswordEventArgs e)
         {
-            ToastNotificationHelper.ShowGenericToast("Composite key", "Database successfully updated.");
+            ToastNotificationService.ShowGenericToast("Composite key", "Database successfully updated.");
         }
     }
 }

ModernKeePass/Pages/SettingsPageFrames/SettingsWelcomePage.xaml

@@ -8,7 +8,7 @@
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <TextBlock FontSize="24" VerticalAlignment="Center" Margin="10,-70,0,0" x:Uid="SettingsWelcomeTitle" />
-        <TextBlock VerticalAlignment="Center" FontSize="14" Margin="5,0,0,0" x:Uid="SettingsWelcomeDesc" />
-        <TextBlock VerticalAlignment="Center" FontSize="14" Margin="5,0,0,0" x:Uid="SettingsWelcomeHowto" />
+        <TextBlock VerticalAlignment="Center" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,0,0,0" x:Uid="SettingsWelcomeDesc" />
+        <TextBlock VerticalAlignment="Center" Style="{StaticResource TextBlockSettingsHeaderStyle}" Margin="5,0,0,0" x:Uid="SettingsWelcomeHowto" />
     </StackPanel>
 </Page>