Changed test project type to WIndows 8.1

Changed test project framework from Nunit to MSTest Changed HashAlgorithm from BouncyCastle to WinRT crypto WIP progress bar in opendatabaseusercontrol TextBox with button made generic WIP implement copy on button click in Entry Page
2025-10-03 15:40:18 -04:00 · 2017-11-06 19:01:01 +01:00
parent 53a54252e3
commit 8e690747e2
85 changed files with 2836 additions and 672 deletions
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
@@ -8,6 +8,8 @@
    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
    xmlns:actions="using:ModernKeePass.Actions" 
    xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:local="using:ModernKeePass.Controls" 
+    xmlns:viewModels="using:ModernKeePass.ViewModels"
    mc:Ignorable="d"
    d:DesignHeight="120"
    d:DesignWidth="550" >
@@ -16,7 +18,13 @@
        <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
        <converters:DoubleToForegroungBrushComplexityConverter x:Key="DoubleToForegroungBrushComplexityConverter"/>
        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <Style TargetType="local:OpenDatabaseUserControl">
+            <Setter Property="Password" Value="{Binding Password, Mode=TwoWay}"/>
+        </Style>
    </UserControl.Resources>
+    <!--<UserControl.DataContext>
+        <viewModels:OpenDatabaseUserControlVm />
+    </UserControl.DataContext>-->
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="50" />
@@ -35,7 +43,11 @@
                </core:DataTriggerBehavior>
            </interactivity:Interaction.Behaviors>
        </PasswordBox>
-        <ProgressBar Grid.Row="0" Grid.Column="1" Value="{Binding PasswordComplexityIndicator, ElementName=UserControl, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="500" VerticalAlignment="Bottom" Foreground="{Binding PasswordComplexityIndicator, ElementName=UserControl, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" Visibility="{Binding CreateNew, ElementName=UserControl, Converter={StaticResource BooleanToVisibilityConverter}}" />
+        <ProgressBar x:Name="progressBar" Grid.Row="0" Grid.Column="1" 
+                     Maximum="128" Width="500" VerticalAlignment="Bottom" 
+                     Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
+                     Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" 
+                     Visibility="{Binding CreateNew, ElementName=UserControl, Converter={StaticResource BooleanToVisibilityConverter}}" />
        <CheckBox x:Name="KeyFileCheckBox" Grid.Row="1" Grid.Column="0" />
        <HyperlinkButton Grid.Row="1" Grid.Column="1" Margin="-15,0,0,0" Content="Select key file from disk..." IsEnabled="{Binding IsChecked, ElementName=KeyFileCheckBox}" Click="KeyFileButton_Click" />
        <Button Grid.Column="0" Grid.Row="2" Content="OK" Click="OpenButton_OnClick" Background="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" />
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
@@ -5,7 +5,6 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Input;
 using ModernKeePass.Common;
 using ModernKeePass.Events;
-using ModernKeePassLib.Cryptography;

 // Pour en savoir plus sur le modèle d'élément Contrôle utilisateur, consultez la page http://go.microsoft.com/fwlink/?LinkId=234236

--- a/ModernKeePass/Controls/TextBoxWithButton.cs
+++ b/ModernKeePass/Controls/TextBoxWithButton.cs
@@ -6,15 +6,38 @@ namespace ModernKeePass.Controls
 {
    public class TextBoxWithButton : TextBox
    {
-        public event EventHandler<RoutedEventArgs> GotoClick;
+        /*public Symbol ButtonSymbol
+        {
+            get { return (Symbol)GetValue(ButtonSymbolProperty); }
+            set { SetValue(ButtonSymbolProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonSymbolProperty =
+            DependencyProperty.Register(
+                "ButtonSymbol",
+                typeof(Symbol),
+                typeof(TextBoxWithButton),
+                new PropertyMetadata(Symbol.Delete, (o, args) => { }));*/
+
+        public string ButtonSymbol
+        {
+            get { return (string)GetValue(ButtonSymbolProperty); }
+            set { SetValue(ButtonSymbolProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonSymbolProperty =
+            DependencyProperty.Register(
+                "ButtonSymbol",
+                typeof(string),
+                typeof(TextBoxWithButton),
+                new PropertyMetadata("&#xE107;", (o, args) => { }));
+        public event EventHandler<RoutedEventArgs> ButtonClick;

        protected override void OnApplyTemplate()
        {
            base.OnApplyTemplate();
-            var extraButton = GetTemplateChild("GotoButton") as Button;
-            if (extraButton != null)
+            var actionButton = GetTemplateChild("ActionButton") as Button;
+            if (actionButton != null)
            {
-                extraButton.Click += (sender, e) => GotoClick?.Invoke(sender, e);
+                actionButton.Click += (sender, e) => ButtonClick?.Invoke(sender, e);
            }
        }
    }
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -161,7 +161,7 @@
      <DependentUpon>WelcomePage.xaml</DependentUpon>
    </Compile>
    <Compile Include="ViewModels\AboutVm.cs" />
-    <Compile Include="ViewModels\Controls\OpenDatabaseUserControlVM.cs" />
+    <Compile Include="ViewModels\Controls\OpenDatabaseUserControlVm.cs" />
    <Compile Include="ViewModels\Items\ListMenuItemVm.cs" />
    <Compile Include="ViewModels\Items\MainMenuItemVm.cs" />
    <Compile Include="ViewModels\Items\RecentItemVm.cs" />
@@ -296,7 +296,7 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="Validation, Version=2.4.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Validation.2.4.15\lib\portable-net45+win8+wp8+wpa81\Validation.dll</HintPath>
+      <HintPath>..\packages\Validation.2.4.18\lib\portable-net45+win8+wp8+wpa81\Validation.dll</HintPath>
      <Private>True</Private>
    </Reference>
  </ItemGroup>
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -428,14 +428,14 @@
                </Style>
            </StackPanel.Resources>
            <TextBlock TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
-            <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" Width="350"  Height="32" />
+            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding UserName, Mode=TwoWay}" Width="350" Height="32" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" />
            <TextBlock TextWrapping="Wrap" Text="Password"  FontSize="18"/>
            <PasswordBox HorizontalAlignment="Left" Password="{Binding Password, Mode=TwoWay}" Width="350" Height="32" IsPasswordRevealButtonEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" Style="{StaticResource PasswordBoxWithButtonStyle}" />
-            <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" />
+            <local:TextBoxWithButton HorizontalAlignment="Left"  Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" />
            <ProgressBar Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="350" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
            <CheckBox HorizontalAlignment="Left" Margin="-3,0,0,0" Content="Show password" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}" IsEnabled="{Binding IsRevealPasswordEnabled}" />
            <TextBlock TextWrapping="Wrap" Text="URL" FontSize="18"/>
-            <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" GotoClick="UrlButton_Click" />
+            <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" ButtonClick="UrlButton_Click" ButtonSymbol="&#xE111;" />
            <TextBlock TextWrapping="Wrap" Text="Notes" FontSize="18"/>
            <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
            <CheckBox FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" Content="Expiration date"/>
--- a/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
@@ -6,7 +6,8 @@
    xmlns:viewModels="using:ModernKeePass.ViewModels"
    xmlns:local="using:ModernKeePass.Controls"
    xmlns:converters="using:ModernKeePass.Converters" 
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" 
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core" 
    x:Class="ModernKeePass.Pages.RecentDatabasesPage"
    mc:Ignorable="d">
    <Page.Resources>
@@ -35,9 +36,9 @@
                    <TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
                    <local:OpenDatabaseUserControl Grid.Row="2" x:Name="DatabaseUserControl" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking" >
                        <interactivity:Interaction.Behaviors>
-                            <Core:EventTriggerBehavior EventName="ValidationChecked">
-                                <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
-                            </Core:EventTriggerBehavior>
+                            <core:EventTriggerBehavior EventName="ValidationChecked">
+                                <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                            </core:EventTriggerBehavior>
                        </interactivity:Interaction.Behaviors>
                    </local:OpenDatabaseUserControl>
                </Grid>
--- a/ModernKeePass/Styles/TextBoxWithButtonStyle.xaml
+++ b/ModernKeePass/Styles/TextBoxWithButtonStyle.xaml
@@ -1,8 +1,9 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:ModernKeePass.Controls">

-    <Style TargetType="TextBox" x:Name="TextBoxWithButtonStyle">
+    <Style TargetType="controls:TextBoxWithButton" x:Name="TextBoxWithButtonStyle">
        <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
        <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
        <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
@@ -18,10 +19,10 @@
        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
        <Setter Property="Template">
            <Setter.Value>
-                <ControlTemplate TargetType="TextBox">
+                <ControlTemplate TargetType="controls:TextBoxWithButton">
                    <Grid>
                        <Grid.Resources>
-                            <Style x:Name="GotoButtonStyle" TargetType="Button">
+                            <Style x:Name="ActionButtonStyle" TargetType="Button">
                                <Setter Property="Template">
                                    <Setter.Value>
                                        <ControlTemplate TargetType="Button">
@@ -87,7 +88,7 @@
                                                            VerticalAlignment="Center"
                                                            HorizontalAlignment="Center"
                                                            FontStyle="Normal"
-                                                            Text="&#xE111;"
+                                                            Text="{TemplateBinding Content}"
                                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                            AutomationProperties.AccessibilityView="Raw"/>
                                                </Border>
@@ -148,7 +149,7 @@
                            <VisualStateGroup x:Name="ButtonStates">
                                <VisualState x:Name="ButtonVisible">
                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GotoButton"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
                                                                       Storyboard.TargetProperty="Visibility">
                                            <DiscreteObjectKeyFrame KeyTime="0">
                                                <DiscreteObjectKeyFrame.Value>
@@ -212,14 +213,15 @@
                                      Grid.ColumnSpan="2"
                                      Content="{TemplateBinding PlaceholderText}" 
                                      IsHitTestVisible="False"/>
-                        <Button x:Name="GotoButton"
+                        <Button x:Name="ActionButton"
                                Grid.Row="1"
-                                Style="{StaticResource GotoButtonStyle}"
+                                Style="{StaticResource ActionButtonStyle}"
                                BorderThickness="{TemplateBinding BorderThickness}"
                                IsTabStop="False"
                                Grid.Column="1"
                                Visibility="Collapsed"
                                FontSize="{TemplateBinding FontSize}"
+                                Content="{TemplateBinding ButtonSymbol}"
                                VerticalAlignment="Stretch"/>
                    </Grid>
                </ControlTemplate>
--- a/ModernKeePass/ViewModels/Controls/OpenDatabaseUserControlVM.cs
+++ b/ModernKeePass/ViewModels/Controls/OpenDatabaseUserControlVM.cs
@@ -5,7 +5,18 @@ namespace ModernKeePass.ViewModels
 {
    public class OpenDatabaseUserControlVm: NotifyPropertyChangedBase
    {
+        private string _password;

-        //public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
+        public string Password
+        {
+            get { return _password; }
+            set
+            {
+                _password = value;
+                OnPropertyChanged("PasswordComplexityIndicator");
+            }
+        }
+
+        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
    }
 }
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -25,7 +25,7 @@ namespace ModernKeePass.ViewModels
        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
        public bool IsFirstItem => _pwEntry == null;

-        public double PasswordLength { get; set; } = 25;
+
        public bool UpperCasePatternSelected { get; set; } = true;
        public bool LowerCasePatternSelected { get; set; } = true;
        public bool DigitsPatternSelected { get; set; } = true;
@@ -37,6 +37,15 @@ namespace ModernKeePass.ViewModels
        public string CustomChars { get; set; } = string.Empty;
        public PwUuid IdUuid => _pwEntry?.Uuid;

+        public double PasswordLength
+        {
+            get { return _passwordLength; }
+            set
+            {
+                _passwordLength = value;
+                NotifyPropertyChanged("PasswordLength");
+            }
+        }
        public string Name
        {
            get
@@ -54,6 +63,7 @@ namespace ModernKeePass.ViewModels
            get { return GetEntryValue(PwDefs.UserNameField); }
            set { SetEntryValue(PwDefs.UserNameField, value); }
        }
+
        public string Password
        {
            get { return GetEntryValue(PwDefs.PasswordField); }
@@ -91,6 +101,7 @@ namespace ModernKeePass.ViewModels
            get { return new DateTimeOffset(_pwEntry.ExpiryTime.Date); }
            set { if (HasExpirationDate) _pwEntry.ExpiryTime = value.DateTime; }
        }
+
        public TimeSpan ExpiryTime
        {
            get { return _pwEntry.ExpiryTime.TimeOfDay; }
@@ -142,6 +153,7 @@ namespace ModernKeePass.ViewModels
        private readonly App _app = (App)Application.Current;
        private bool _isEditMode;
        private bool _isRevealPassword;
+        private double _passwordLength = 25;

        private void NotifyPropertyChanged(string propertyName)
        {
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -24,5 +24,5 @@
  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="win81" />
  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="win81" />
  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="win81" />
-  <package id="Validation" version="2.4.15" targetFramework="win81" />
+  <package id="Validation" version="2.4.18" targetFramework="win81" />
 </packages>