Merge branch 'develop'

Erapchu · Jun 11, 2023 · bd13768 · bd13768
2 parents 643073a + 4dbafbe
commit bd13768
Show file tree

Hide file tree

Showing 18 changed files with 155 additions and 117 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -6,54 +6,30 @@ on:
       - 'v*'
 
 jobs:
-
   build:
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+    runs-on: windows-latest
     env:
       SOLUTION_NAME: SinglePass.WPF.sln
       PROJECT_PATH: .\SinglePass.WPF\SinglePass.WPF.csproj
       CONFIGURATION: Release
-
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    # Install the .NET Core workload
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
+    - name: Setup MSBuild
       uses: microsoft/[email protected]
-
-    # Restore the application to populate the obj folder with RuntimeIdentifiers
     - name: Restore
       run: |
        msbuild $env:PROJECT_PATH /t:Restore /p:Configuration=$env:CONFIGURATION
-
-    # Build the application to populate the bin folder
     - name: Build
       run: |
-       msbuild $env:PROJECT_PATH /t:Publish /p:Configuration=$env:CONFIGURATION /p:RuntimeIdentifier=win-x64 /p:SelfContained=true /p:PublishReadyToRun=True /p:PublishSingleFile=true
-    
-    # Upload artifacts
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: build_result
-        path: .\SinglePass.WPF\bin\Release\net7.0-windows\win-x64\publish\
-
-    # Create .zip from artifacts
+       msbuild $env:PROJECT_PATH /t:Publish /p:Configuration=$env:CONFIGURATION /p:RuntimeIdentifier=win-x64 /p:SelfContained=true /p:PublishReadyToRun=true /p:PublishSingleFile=true
     - name: Create .zip artifacts
       run: |
         Compress-Archive -Path '.\SinglePass.WPF\bin\Release\net7.0-windows\win-x64\publish\' -DestinationPath '.\build_result.zip'
-
-    # Use script because we need to automate generate_release_notes
     - name: Create release
       uses: "actions/[email protected]"
       env:
@@ -77,8 +53,6 @@ jobs:
           } catch (error) {
             core.setFailed(error.message);
           }
-
-    # Upload artifacts to release
     - name: Upload artifact
       uses: actions/upload-release-asset@v1
       env:
@@ -88,8 +62,6 @@ jobs:
         asset_path: .\build_result.zip
         asset_name: build_result.zip
         asset_content_type: application/zip
-
-
 
       # - name: Create release
       #   uses: actions/create-release@v1

diff --git a/SinglePass.Language/Properties/Resources.Designer.cs b/SinglePass.Language/Properties/Resources.Designer.cs
diff --git a/SinglePass.Language/Properties/Resources.resx b/SinglePass.Language/Properties/Resources.resx
@@ -325,11 +325,11 @@
   <data name="CanTMergeCredentials" xml:space="preserve">
     <value>Can't merge credentials</value>
   </data>
-  <data name="ToPasteLogin" xml:space="preserve">
-    <value>to paste login</value>
+  <data name="ToPasteCombination" xml:space="preserve">
+    <value>to paste combination</value>
   </data>
-  <data name="ToPastePassword" xml:space="preserve">
-    <value>to paste password</value>
+  <data name="ToPasteLoginOrPassword" xml:space="preserve">
+    <value>to paste login or password</value>
   </data>
   <data name="Theme" xml:space="preserve">
     <value>Theme</value>

diff --git a/SinglePass.Language/Properties/Resources.ru.resx b/SinglePass.Language/Properties/Resources.ru.resx
@@ -345,11 +345,11 @@
   <data name="NoAnyChanges" xml:space="preserve">
     <value>Нет изменений</value>
   </data>
-  <data name="ToPasteLogin" xml:space="preserve">
-    <value>для вставки логина</value>
+  <data name="ToPasteCombination" xml:space="preserve">
+    <value>для вставки комбинации</value>
   </data>
-  <data name="ToPastePassword" xml:space="preserve">
-    <value>для вставки пароля</value>
+  <data name="ToPasteLoginOrPassword" xml:space="preserve">
+    <value>для вставки логина или пароля</value>
   </data>
   <data name="Theme" xml:space="preserve">
     <value>Тема</value>

diff --git a/SinglePass.WPF/App.xaml.cs b/SinglePass.WPF/App.xaml.cs
@@ -52,6 +52,12 @@ public App()
                 _configuration = BuildConfiguration();
                 Services = ConfigureServices(_configuration);
             }
+            else
+            {
+                // Show main window and shutdown process
+                InterprocessHelper.ShowMainWindow();
+                Environment.Exit(0);
+            }
         }
 
         private static IServiceProvider ConfigureServices(IConfiguration configuration)
@@ -138,42 +144,34 @@ private void Application_Startup(object sender, StartupEventArgs e)
             // Override culture
             //SinglePass.Language.Properties.Resources.Culture = new System.Globalization.CultureInfo("en-US");
 
-            if (IsFirstInstance)
-            {
-                var hiw = new HiddenInterprocessWindow();
-                hiw.InitWithoutShowing();
+            var hiw = new HiddenInterprocessWindow();
+            hiw.InitWithoutShowing();
+
+            Constants.EnsurePaths();
 
-                Constants.EnsurePaths();
+            // Resolve theme
+            var themeService = Services.GetService<ThemeService>();
+            themeService.Init();
 
-                // Resolve theme
-                var themeService = Services.GetService<ThemeService>();
-                themeService.Init();
+            // Login
+            using (var loginScope = Services.CreateScope())
+            {
+                var loginWindow = loginScope.ServiceProvider.GetService<LoginWindow>();
+                bool? dialogResult = loginWindow.ShowDialog(); // Stop here
 
-                // Login
-                using (var loginScope = Services.CreateScope())
+                if (dialogResult != true)
                 {
-                    var loginWindow = loginScope.ServiceProvider.GetService<LoginWindow>();
-                    bool? dialogResult = loginWindow.ShowDialog(); // Stop here
-
-                    if (dialogResult != true)
-                    {
-                        Shutdown();
-                        return;
-                    }
+                    Shutdown();
+                    return;
                 }
+            }
 
-                // Create tray icon
-                _trayIcon = new TrayIcon();
+            // Create tray icon
+            _trayIcon = new TrayIcon();
 
-                // Open main window
-                var mainWindow = Services.GetService<MainWindow>();
-                mainWindow.Show();
-            }
-            else
-            {
-                InterprocessHelper.ShowMainWindow();
-                Shutdown();
-            }
+            // Open main window
+            var mainWindow = Services.GetService<MainWindow>();
+            mainWindow.Show();
         }
 
         private void Application_Exit(object sender, ExitEventArgs e)

diff --git a/SinglePass.WPF/Helpers/WindowsKeyboard.cs b/SinglePass.WPF/Helpers/WindowsKeyboard.cs
@@ -7,6 +7,7 @@ internal static class WindowsKeyboard
     {
         public const byte VK_V = 0x56;
         public const byte VK_CONTROL = 0x11;
+        public const byte VK_TAB = 0x09;
         public const int KEYEVENTF_KEYUP = 0x0002;
 
         public const uint WM_PASTE = 0x0302;

diff --git a/SinglePass.WPF/SinglePass.WPF.csproj b/SinglePass.WPF/SinglePass.WPF.csproj
@@ -35,16 +35,16 @@
 
   <ItemGroup>
     <PackageReference Include="AsyncKeyedLock" Version="6.2.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-    <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.8.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
-    <PackageReference Include="NLog" Version="5.1.2" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NHotkey.Wpf" Version="2.1.1" />
+    <PackageReference Include="NLog" Version="5.2.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
     <PackageReference Include="Unidecode.NET" Version="2.1.0" />
   </ItemGroup>
 

diff --git a/SinglePass.WPF/ViewModels/CloudSyncViewModel.cs b/SinglePass.WPF/ViewModels/CloudSyncViewModel.cs
@@ -16,8 +16,7 @@
 
 namespace SinglePass.WPF.ViewModels
 {
-    [INotifyPropertyChanged]
-    public partial class CloudSyncViewModel
+    public partial class CloudSyncViewModel : ObservableObject
     {
         #region Design time instance
         private static readonly Lazy<CloudSyncViewModel> _lazy = new(GetDesignTimeVM);

diff --git a/SinglePass.WPF/ViewModels/Dialogs/CreateCredentialViewModel.cs b/SinglePass.WPF/ViewModels/Dialogs/CreateCredentialViewModel.cs
@@ -5,8 +5,7 @@
 
 namespace SinglePass.WPF.ViewModels.Dialogs
 {
-    [INotifyPropertyChanged]
-    public partial class CredentialEditViewModel
+    public partial class CredentialEditViewModel : ObservableObject
     {
         public event Action<MaterialDialogResult?> Accept;
 
@@ -19,7 +18,7 @@ public partial class CredentialEditViewModel
         [ObservableProperty]
         private CredentialDetailsMode _mode;
 
-        public string CaptionText => _mode switch
+        public string CaptionText => Mode switch
         {
             CredentialDetailsMode.Edit => SinglePass.Language.Properties.Resources.Edit,
             CredentialDetailsMode.New => SinglePass.Language.Properties.Resources.NewItem,

diff --git a/SinglePass.WPF/ViewModels/Dialogs/MaterialInputBoxViewModel.cs b/SinglePass.WPF/ViewModels/Dialogs/MaterialInputBoxViewModel.cs
@@ -5,8 +5,7 @@
 
 namespace SinglePass.WPF.ViewModels.Dialogs
 {
-    [INotifyPropertyChanged]
-    public partial class MaterialInputBoxViewModel
+    public partial class MaterialInputBoxViewModel : ObservableObject
     {
         private static readonly Lazy<MaterialInputBoxViewModel> _lazy = new(() => new MaterialInputBoxViewModel());
         public static MaterialInputBoxViewModel DesignTimeInstance => _lazy.Value;

diff --git a/SinglePass.WPF/ViewModels/Dialogs/MaterialMessageBoxViewModel.cs b/SinglePass.WPF/ViewModels/Dialogs/MaterialMessageBoxViewModel.cs
@@ -5,8 +5,7 @@
 
 namespace SinglePass.WPF.ViewModels.Dialogs
 {
-    [INotifyPropertyChanged]
-    public partial class MaterialMessageBoxViewModel
+    public partial class MaterialMessageBoxViewModel : ObservableObject
     {
         #region Design time instance
         private static readonly Lazy<MaterialMessageBoxViewModel> _lazyDesignTime = new(CreateDesignTime);

diff --git a/SinglePass.WPF/ViewModels/Dialogs/ProcessingViewModel.cs b/SinglePass.WPF/ViewModels/Dialogs/ProcessingViewModel.cs
@@ -6,8 +6,7 @@
 
 namespace SinglePass.WPF.ViewModels.Dialogs
 {
-    [INotifyPropertyChanged]
-    public partial class ProcessingViewModel
+    public partial class ProcessingViewModel : ObservableObject
     {
         #region Design time instance
         private static readonly Lazy<ProcessingViewModel> _lazy = new(GetDesignTimeVM);

diff --git a/SinglePass.WPF/ViewModels/MainWindowViewModel.cs b/SinglePass.WPF/ViewModels/MainWindowViewModel.cs
@@ -11,8 +11,7 @@
 
 namespace SinglePass.WPF.ViewModels
 {
-    [INotifyPropertyChanged]
-    public partial class MainWindowViewModel
+    public partial class MainWindowViewModel : ObservableObject
     {
         #region Design time instance
         private static readonly Lazy<MainWindowViewModel> _lazy = new(GetDesignTimeVM);

diff --git a/SinglePass.WPF/ViewModels/PasswordsViewModel.cs b/SinglePass.WPF/ViewModels/PasswordsViewModel.cs
@@ -21,8 +21,7 @@
 
 namespace SinglePass.WPF.ViewModels
 {
-    [INotifyPropertyChanged]
-    public partial class PasswordsViewModel
+    public partial class PasswordsViewModel : ObservableObject
     {
         #region Design time instance
         private static readonly Lazy<PasswordsViewModel> _lazy = new(GetDesignTimeVM);