Password complexity indicator works again in new databases (but solution is dirty...)

Copy button in text boxes fully works

ModernKeePass/Actions/ClipboardAction.cs

@@ -0,0 +1,26 @@
+using Windows.ApplicationModel.DataTransfer;
+using Windows.UI.Xaml;
+using Microsoft.Xaml.Interactivity;
+
+namespace ModernKeePass.Actions
+{
+    public class ClipboardAction : DependencyObject, IAction
+    {
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(ClipboardAction), new PropertyMetadata(string.Empty));
+
+        public object Execute(object sender, object parameter)
+        {
+            var dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy };
+            dataPackage.SetText(Text);
+            Clipboard.SetContent(dataPackage);
+            return null;
+        }
+    }
+}

ModernKeePass/Common/ToastNotificationHelper.cs

@@ -2,7 +2,6 @@
 using Windows.Data.Json;
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
-using Windows.UI.Xaml;
 using ModernKeePass.Interfaces;
 using ModernKeePass.ViewModels;
 
@@ -12,7 +11,6 @@ namespace ModernKeePass.Common
     {
         public static void ShowMovedToast(IPwEntity entity, string action, string text)
         {
-            var app = (App)Application.Current;
             var entityType = entity is GroupVm ? "Group" : "Entry";
             var notificationXml = ToastNotificationManager.GetTemplateContent(ToastTemplateType.ToastText02);
             var toastElements = notificationXml.GetElementsByTagName("text");

ModernKeePass/Controls/OpenDatabaseUserControl.xaml

@@ -8,8 +8,6 @@
     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" >
@@ -18,13 +16,7 @@
         <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" />
@@ -36,7 +28,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <CheckBox x:Name="PasswordCheckBox" Grid.Row="0" Grid.Column="0" />
-        <PasswordBox Grid.Row="0" Grid.Column="1" x:Name="PasswordBox" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" Height="30" IsEnabled="{Binding IsChecked, ElementName=PasswordCheckBox}" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" >
+        <PasswordBox Grid.Row="0" Grid.Column="1" x:Name="PasswordBox" PasswordChanged="PasswordBox_OnPasswordChanged" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" Height="30" IsEnabled="{Binding IsChecked, ElementName=PasswordCheckBox}" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" >
             <interactivity:Interaction.Behaviors>
                 <core:DataTriggerBehavior Binding="{Binding IsChecked, ElementName=PasswordCheckBox}" Value="True">
                     <actions:SetupFocusAction TargetObject="{Binding ElementName=PasswordBox}" />
@@ -45,8 +37,8 @@
         </PasswordBox>
         <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}}" 
+                     Value="{Binding PasswordComplexityIndicator, ElementName=UserControl, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
+                     Foreground="{Binding PasswordComplexityIndicator, ElementName=UserControl, 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" />

ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs

@@ -1,17 +1,24 @@
 using System;
+using System.ComponentModel;
 using Windows.Storage.Pickers;
 using Windows.System;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 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
 
 namespace ModernKeePass.Controls
 {
-    public sealed partial class OpenDatabaseUserControl
+    public sealed partial class OpenDatabaseUserControl: INotifyPropertyChanged
     {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public double PasswordComplexityIndicator { get; private set; }
+
         public bool CreateNew
         {
             get { return (bool)GetValue(CreateNewProperty); }
@@ -26,7 +33,7 @@ namespace ModernKeePass.Controls
 
         public string Password
         {
-            get { return (string)GetValue(PasswordProperty); }
+            get { return (string) GetValue(PasswordProperty); }
             set { SetValue(PasswordProperty, value); }
         }
         public static readonly DependencyProperty PasswordProperty =
@@ -35,7 +42,12 @@ namespace ModernKeePass.Controls
                 typeof(string),
                 typeof(OpenDatabaseUserControl),
                 new PropertyMetadata(string.Empty, (o, args) => { }));
-        
+
+        private void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
         public OpenDatabaseUserControl()
         {
             InitializeComponent();
@@ -88,5 +100,12 @@ namespace ModernKeePass.Controls
             app.Database.KeyFile = file;
             StatusTextBlock.Text = $"Key file: {file.Name}";
         }
+
+        private void PasswordBox_OnPasswordChanged(object sender, RoutedEventArgs e)
+        {
+            var passwordBox = sender as PasswordBox;
+            PasswordComplexityIndicator = QualityEstimation.EstimatePasswordBits(passwordBox?.Password.ToCharArray());
+            NotifyPropertyChanged("PasswordComplexityIndicator");
+        }
     }
 }

ModernKeePass/ModernKeePass.csproj

@@ -108,6 +108,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Actions\ClipboardAction.cs" />
     <Compile Include="Actions\SetupFocusAction.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -161,7 +162,6 @@
       <DependentUpon>WelcomePage.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\AboutVm.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" />

ModernKeePass/Pages/EntryDetailPage.xaml

@@ -428,10 +428,22 @@
                 </Style>
             </StackPanel.Resources>
             <TextBlock TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
-            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding UserName, Mode=TwoWay}" Width="350" Height="32" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" />
+            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding UserName, Mode=TwoWay}" Width="350" Height="32" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="ButtonClick">
+                        <actions:ClipboardAction Text="{Binding UserName}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </local:TextBoxWithButton>
             <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}" />
-            <local:TextBoxWithButton HorizontalAlignment="Left"  Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" />
+            <local:TextBoxWithButton HorizontalAlignment="Left" Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="ButtonClick">
+                        <actions:ClipboardAction Text="{Binding Password}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </local:TextBoxWithButton>
             <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"/>

ModernKeePass/Pages/EntryDetailPage.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -101,6 +102,5 @@ namespace ModernKeePass.Pages
                 // TODO: Show some error
             }
         }
-
     }
 }

ModernKeePass/ViewModels/Controls/OpenDatabaseUserControlVM.cs

@@ -1,22 +0,0 @@
-using ModernKeePass.Common;
-using ModernKeePassLib.Cryptography;
-
-namespace ModernKeePass.ViewModels
-{
-    public class OpenDatabaseUserControlVm: NotifyPropertyChangedBase
-    {
-        private string _password;
-
-        public string Password
-        {
-            get { return _password; }
-            set
-            {
-                _password = value;
-                OnPropertyChanged("PasswordComplexityIndicator");
-            }
-        }
-
-        public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password.ToCharArray());
-    }
-}