Update 2.1.0

Author: Onebeld

.vs/OlibKey/DesignTimeBuild/.dtbcache.v2

@@ -18,7 +18,11 @@
 
             <ContextMenu x:Key="TextBoxContextMenu">
                 <MenuItem Command="ApplicationCommands.Cut" />
-                <MenuItem Command="ApplicationCommands.Copy" />
+                <MenuItem Command="ApplicationCommands.Copy">
+                    <MenuItem.Icon>
+                        <Image Width="16" Source="{DynamicResource copyDrawingImage}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem Command="ApplicationCommands.Paste" />
             </ContextMenu>
 

.vs/OlibKey/v16/.suo

@@ -18,10 +18,10 @@ namespace OlibKey
     public partial class App
     {
         public new static MainWindow MainWindow;
-        private static ResourceDictionary ResourceTheme;
+        private static ResourceDictionary _resourceTheme;
         public static Setting Setting;
 
-        private static object sync = new object();
+        public static object Sync = new object();
 
         private static List<CultureInfo> Languages => new List<CultureInfo>();
 
@@ -53,12 +53,12 @@ protected override void OnStartup(StartupEventArgs e)
 
             Language = Lang.Default.IsFirstLanguage ? CultureInfo.CurrentCulture : Lang.Default.DefaultLanguage;
 
-            ResourceTheme = Resources.MergedDictionaries[2];
+            _resourceTheme = Resources.MergedDictionaries[2];
             if (Setting.ApplyTheme != null)
-                ResourceTheme.Source = new Uri($"/Themes/{Setting.ApplyTheme}.xaml", UriKind.Relative);
+                _resourceTheme.Source = new Uri($"/Themes/{Setting.ApplyTheme}.xaml", UriKind.Relative);
 
             MainWindow = new MainWindow();
-            bool startHide = false;
+            var startHide = false;
             if (Setting.AutorunApplication)
                 foreach (var i in e.Args)
                     if (i == "/StartupHide")
@@ -149,16 +149,19 @@ private void WriteLog(object sender, System.Windows.Threading.DispatcherUnhandle
         {
             try
             {
-                string pathToLog = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Log");
+                var pathToLog = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Log");
                 if (!Directory.Exists(pathToLog))
-                Directory.CreateDirectory(pathToLog);
-                string filename = Path.Combine(pathToLog, $"{AppDomain.CurrentDomain.FriendlyName}_{DateTime.Now:dd.MM.yyy}.log");
-                string fullText = $"[{DateTime.Now:dd.MM.yyy HH:mm:ss.fff}] [{e.Exception.TargetSite.DeclaringType}.{e.Exception.TargetSite.Name}()]\n{e.Exception}\r\n";
-                lock (sync) File.AppendAllText(filename, fullText, Encoding.GetEncoding("UTF-8"));
+                    Directory.CreateDirectory(pathToLog);
+                var filename = Path.Combine(pathToLog, $"{AppDomain.CurrentDomain.FriendlyName}_{DateTime.Now:dd.MM.yyy}.log");
+                var fullText = $"[{DateTime.Now:dd.MM.yyy HH:mm:ss.fff}] [{e.Exception.TargetSite.DeclaringType}.{e.Exception.TargetSite.Name}()]\n{e.Exception}\r\n";
+                lock (Sync) File.AppendAllText(filename, fullText, Encoding.GetEncoding("UTF-8"));
 
                 MessageBox.Show((string)FindResource("MB9") + $"\n{e.Exception.Message}", (string)FindResource("Error"), MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            catch { }
+            catch
+            {
+                // ignored
+            }
         }
     }
 }

App.xaml

@@ -6,7 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [2.0.0.0] - 2020-03-04
+## [2.1.0] - 2020-04-30
+### Added
+- New item Reminder added.
+- New option for quick rendering in the settings.
+- Added ability to create custom folders.
+- Search added.
+- New icons added.
+
+### Changed
+- Updated user interface.
+- Base storage method changed.
+- Animations on the start page are simplified.
+- Now, when changing the theme, the resource with icons is reloaded.
+- The name of the database now does not contain an extension.
+- Minor changes in the logical component.
+
+### Fixed
+- Partially fixed display of text (blur).
+- If you lock the store, and then create a new one, the unlock button will become active.
+
+## [2.0.0] - 2020-03-04
 ### Added
 - Added buttons for moving items.
 - Added icons for items in the list.

App.xaml.cs

@@ -17,7 +17,7 @@
         <Border Background="White" CornerRadius="999" Grid.RowSpan="2" Height="25" Width="25" Margin="5,0">
             <Image x:Name="imageIcon" Source="{Binding IconWebSite, UpdateSourceTrigger=PropertyChanged}" Margin="5"/>
         </Border>
-        <TextBlock Text="{Binding AccountName}" FontWeight="Bold" FontSize="16" Grid.Column="1" Foreground="{DynamicResource ForegroundWindow}"/>
+        <TextBlock Text="{Binding AccountName}" FontWeight="Bold" FontSize="16" Grid.Row="0" Grid.Column="1" Foreground="{DynamicResource ForegroundWindow}"/>
         <TextBlock Text="{Binding Username}" FontSize="12" Grid.Column="1" Grid.Row="1" Foreground="{DynamicResource ForegroundOpacity}"/>
     </Grid>
 </UserControl>

CHANGELOG.md

@@ -17,7 +17,7 @@ public partial class AccountListItem : UserControl
         public Action<Account> ShowContentCallback { get; set; }
         public Action<Account> EditContentCallback { get; set; }
         public Action FocusCallback { get; set; }
-        public Account AccountContext { get => DataContext as Account; }
+        public Account AccountContext => DataContext as Account;
         public AccountListItem() => InitializeComponent();
 
         public DispatcherTimer timer;
@@ -65,9 +65,9 @@ private void Timer_Tick(object sender, EventArgs e)
                 {
                     timer.Stop();
 
-                    ReminderWindow reminderWindow = new ReminderWindow
+                    var reminderWindow = new ReminderWindow
                     {
-                        accountListItem = this,
+                        AccountListItem = this,
                         lNameElement = {Content = AccountContext.AccountName},
                         lTimeStart = {Content = AccountContext.Username}
                     };

Controls/AccountListItem.xaml

@@ -8,7 +8,7 @@ namespace OlibKey.Controls
     /// </summary>
     public partial class FolderListItem : UserControl
     {
-        public CustomFolder FolderContext { get => DataContext as CustomFolder; }
+        public CustomFolder FolderContext => DataContext as CustomFolder;
         public FolderListItem() => InitializeComponent();
     }
 }

Controls/AccountListItem.xaml.cs

@@ -8,10 +8,10 @@ namespace OlibKey.Core
 {
     public static class Animations
     {
-        public async static Task ClosingWindowAnimation(Window w, ScaleTransform transform)
+        public static async Task ClosingWindowAnimation(Window w, ScaleTransform transform)
         {
-            DoubleAnimation anim = new DoubleAnimation { Duration = TimeSpan.FromSeconds(0.2), From = 1, To = 0, AccelerationRatio = 1};
-            DoubleAnimation anim1 = new DoubleAnimation
+            var anim = new DoubleAnimation { Duration = TimeSpan.FromSeconds(0.2), From = 1, To = 0, AccelerationRatio = 1};
+            var anim1 = new DoubleAnimation
             {
                 Duration = TimeSpan.FromSeconds(0.2),
                 AccelerationRatio = 1,

Controls/FolderListItem.xaml.cs

@@ -19,46 +19,40 @@ private static byte[] GetRandomBytes()
 
         private static byte[] AES_Encrypt(byte[] bytesToBeEncrypted, byte[] passwordBytes)
         {
-            byte[] encryptedBytes;
             byte[] saltBytes = {1, 2, 3, 4, 5, 6, 7, 8};
-            using (var ms = new MemoryStream())
-            {
-                var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 2000);
-                using var aes = new RijndaelManaged {KeySize = 256, BlockSize = 128, Mode = CipherMode.CBC};
-                aes.Key = key.GetBytes(aes.KeySize / 8);
-                aes.IV = key.GetBytes(aes.BlockSize / 8);
-                using (var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write))
-                {
-                    cs.Write(bytesToBeEncrypted, 0, bytesToBeEncrypted.Length);
-                    cs.Close();
-                }
-
-                encryptedBytes = ms.ToArray();
-            }
-
-            return encryptedBytes;
+
+            using var ms = new MemoryStream();
+
+            var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 2000);
+            using var aes = new RijndaelManaged {KeySize = 256, BlockSize = 128, Mode = CipherMode.CBC};
+            aes.Key = key.GetBytes(aes.KeySize / 8);
+            aes.IV = key.GetBytes(aes.BlockSize / 8);
+
+            using var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write);
+
+            cs.Write(bytesToBeEncrypted, 0, bytesToBeEncrypted.Length);
+            cs.Close();
+
+            return ms.ToArray();
         }
 
         private static byte[] AES_Decrypt(byte[] bytesToBeDecrypted, byte[] passwordBytes)
         {
-            byte[] decryptedBytes;
             byte[] saltBytes = {1, 2, 3, 4, 5, 6, 7, 8};
-            using (var ms = new MemoryStream())
-            {
-                var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 2000);
-                using var aes = new RijndaelManaged {KeySize = 256, BlockSize = 128, Mode = CipherMode.CBC};
-                aes.Key = key.GetBytes(aes.KeySize / 8);
-                aes.IV = key.GetBytes(aes.BlockSize / 8);
-                using (var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write))
-                {
-                    cs.Write(bytesToBeDecrypted, 0, bytesToBeDecrypted.Length);
-                    cs.Close();
-                }
-
-                decryptedBytes = ms.ToArray();
-            }
-
-            return decryptedBytes;
+
+            using var ms = new MemoryStream();
+
+            var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 2000);
+            using var aes = new RijndaelManaged {KeySize = 256, BlockSize = 128, Mode = CipherMode.CBC};
+            aes.Key = key.GetBytes(aes.KeySize / 8);
+            aes.IV = key.GetBytes(aes.BlockSize / 8);
+
+            using var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write);
+
+            cs.Write(bytesToBeDecrypted, 0, bytesToBeDecrypted.Length);
+            cs.Close();
+
+            return ms.ToArray();
         }
 
         public static string EncryptString(string text, string password)
@@ -71,21 +65,21 @@ public static string EncryptString(string text, string password)
             for (var i = 0; i < baSalt.Length; i ++) baEncrypted[i] = baSalt[i];
             for (var i = 0; i < baText.Length; i ++) baEncrypted[i + baSalt.Length] = baText[i];
             baEncrypted = AES_Encrypt(baEncrypted, baPwdHash);
-            string result = Convert.ToBase64String(baEncrypted);
-            return result;
+
+            return Convert.ToBase64String(baEncrypted);
         }
 
         public static string DecryptString(string text, string password)
         {
-            byte[] baPwd = Encoding.UTF8.GetBytes(password);
-            byte[] baPwdHash = SHA256.Create().ComputeHash(baPwd);
-            byte[] baText = Convert.FromBase64String(text);
-            byte[] baDecrypted = AES_Decrypt(baText, baPwdHash);
-            int saltLength = SaltLength;
-            byte[] baResult = new byte[baDecrypted.Length - saltLength];
+            var baPwd = Encoding.UTF8.GetBytes(password);
+            var baPwdHash = SHA256.Create().ComputeHash(baPwd);
+            var baText = Convert.FromBase64String(text);
+            var baDecrypted = AES_Decrypt(baText, baPwdHash);
+            var saltLength = SaltLength;
+            var baResult = new byte[baDecrypted.Length - saltLength];
             for (int i = 0; i < baResult.Length; i ++) baResult[i] = baDecrypted[i + saltLength];
-            string result = Encoding.UTF8.GetString(baResult);
-            return result;
+
+            return Encoding.UTF8.GetString(baResult);
         }
     }
 }