Merge pull request #85 from Leo-Corporation/vNext

Version 1.8.0.2110
Leo-Corporation · Oct 16, 2021 · 84a9cb6 · 84a9cb6
2 parents d02b4d6 + c2f601e
commit 84a9cb6
Show file tree

Hide file tree

Showing 30 changed files with 253 additions and 191 deletions.
diff --git a/Passliss.Setup/Setup.iss b/Passliss.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Passliss"
-#define MyAppVersion "1.7.0.2109"
-#define MyAppFullVersion "1.7.0.2109"
+#define MyAppVersion "1.8.0.2110"
+#define MyAppFullVersion "1.8.0.2110"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "Passliss.exe"

diff --git a/Passliss/App.xaml.cs b/Passliss/App.xaml.cs
@@ -22,12 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
 using Passliss.Classes;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace Passliss

diff --git a/Passliss/Classes/Global.cs b/Passliss/Classes/Global.cs
@@ -100,7 +100,7 @@ public static class Global
 		/// <summary>
 		/// The current version of Passliss.
 		/// </summary>
-		public static string Version => "1.7.0.2109";
+		public static string Version => "1.8.0.2110";
 
 		/// <summary>
 		/// GitHub link for the last version (<see cref="string"/>).
@@ -146,7 +146,7 @@ public static void ChangeTheme()
 
 			App.Current.Resources.MergedDictionaries.Add(resourceDictionary); // Add the dictionary
 		}
-		
+
 		public static bool IsSystemThemeDark()
 		{
 			if (Env.WindowsVersion != WindowsVersion.Windows10)

diff --git a/Passliss/Classes/PasswordConfiguration.cs b/Passliss/Classes/PasswordConfiguration.cs
@@ -21,11 +21,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Passliss.Classes
 {

diff --git a/Passliss/Classes/PasswordConfigurationManager.cs b/Passliss/Classes/PasswordConfigurationManager.cs
@@ -25,9 +25,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Xml.Serialization;
 

diff --git a/Passliss/Classes/Settings.cs b/Passliss/Classes/Settings.cs
@@ -24,12 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using LeoCorpLibrary;
 using Passliss.Enums;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Xml.Serialization;
 

diff --git a/Passliss/Enums/DefaultPage.cs b/Passliss/Enums/DefaultPage.cs
@@ -21,11 +21,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Passliss.Enums
 {

diff --git a/Passliss/Enums/PasswordStrenght.cs b/Passliss/Enums/PasswordStrenght.cs
@@ -21,11 +21,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Passliss.Enums
 {

diff --git a/Passliss/Extensions/StringExtensions.cs b/Passliss/Extensions/StringExtensions.cs
@@ -23,10 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using Passliss.Classes;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Passliss.Extensions
 {

diff --git a/Passliss/Fonts/FluentSystemIcons-Filled.ttf b/Passliss/Fonts/FluentSystemIcons-Filled.ttf
diff --git a/Passliss/MainWindow.xaml.cs b/Passliss/MainWindow.xaml.cs
@@ -24,21 +24,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using Passliss.Classes;
 using Passliss.Enums;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Passliss
 {
@@ -65,15 +55,15 @@ public MainWindow()
 		private void InitUI()
 		{
 			HelloTxt.Text = Global.GetHiSentence; // Set the "Hi" message
-			PageContent.Content = Global.Settings.StartupPage switch 
-			{ 
+			PageContent.Content = Global.Settings.StartupPage switch
+			{
 				DefaultPage.Generate => Global.GeneratePage,
 				DefaultPage.Strength => Global.StrenghtPage,
 				_ => Global.GeneratePage
 			}; // Set startup page
 
-			CheckButton(Global.Settings.StartupPage switch 
-			{ 
+			CheckButton(Global.Settings.StartupPage switch
+			{
 				DefaultPage.Generate => GenerateTabBtn,
 				DefaultPage.Strength => StrenghtTabBtn,
 				_ => GenerateTabBtn

diff --git a/Passliss/Pages/GeneratePage.xaml b/Passliss/Pages/GeneratePage.xaml
@@ -26,9 +26,21 @@
 					<ColumnDefinition Width="Auto"/>
 				</Grid.ColumnDefinitions>
 				<TextBlock Text="{x:Static lang:Resources.Password}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="16"/>
-				<Button Content="&#xF4D7;" Padding="5" x:Name="RandomizeBtn" Click="RandomizeBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0"/>
-				<Button Content="&#xF160;" Padding="5" x:Name="ShowFullPasswordBtn" Click="ShowFullPasswordBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="2" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0"/>
-				<Button Content="&#xF47F;" Padding="5" x:Name="HistoryBtn" Click="HistoryBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="3" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14"/>
+				<Button Content="&#xF4D7;" Padding="5" x:Name="RandomizeBtn" Click="RandomizeBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0">
+					<Button.ToolTip>
+						<ToolTip Content="{x:Static lang:Resources.RandomizePasswordConfiguration}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+					</Button.ToolTip>
+				</Button>
+				<Button Content="&#xF160;" Padding="5" x:Name="ShowFullPasswordBtn" Click="ShowFullPasswordBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="2" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0">
+					<Button.ToolTip>
+						<ToolTip Content="{x:Static lang:Resources.ShowFullPassword}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+					</Button.ToolTip>
+				</Button>
+				<Button Content="&#xF47F;" Padding="5" x:Name="HistoryBtn" Click="HistoryBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="3" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14">
+					<Button.ToolTip>
+						<ToolTip Content="{x:Static lang:Resources.History}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+					</Button.ToolTip>
+				</Button>
 			</Grid>
 			<StackPanel x:Name="Header">
 				<TextBlock x:Name="PasswordTxt" d:Text="PasswordGoHere" HorizontalAlignment="Center" FontWeight="Bold" FontSize="24" Margin="0 10 0 0" Foreground="{Binding Source={StaticResource Foreground1}}"/>
@@ -55,7 +67,11 @@
             <StackPanel Orientation="Horizontal" Grid.Column="1" VerticalAlignment="Top">
                 <TextBlock Text="{x:Static lang:Resources.Lenght}" Foreground="{Binding Source={StaticResource Foreground1}}" Margin="0,0,10,0" FontWeight="Bold" FontSize="14" VerticalAlignment="Center"/>
                 <TextBox x:Name="LenghtTxt" PreviewTextInput="LenghtTxt_PreviewTextInput" Style="{DynamicResource TextBoxStyle1}" Width="50" FontSize="14" FontWeight="Bold" Background="{x:Null}" BorderBrush="#FF007FFF" Foreground="{Binding Source={StaticResource Foreground1}}" CaretBrush="{Binding Source={StaticResource Foreground1}}" SelectionBrush="#FF007AF5"/>
-                <Button x:Name="RandomizeLength" Click="RandomizeLength_Click" Content="&#xea4b;" Cursor="Hand" Padding="7,5,7,5" FontFamily="..\Fonts\#FluentlyIcons" Style="{StaticResource TabButtonStyle}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" Background="{Binding Source={StaticResource AccentColor}}" Margin="5,0,0,0"/>
+				<Button x:Name="RandomizeLength" Click="RandomizeLength_Click" Content="&#xea4b;" Cursor="Hand" Padding="7,5,7,5" FontFamily="..\Fonts\#FluentlyIcons" Style="{StaticResource TabButtonStyle}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" Background="{Binding Source={StaticResource AccentColor}}" Margin="5,0,0,0">
+					<Button.ToolTip>
+						<ToolTip Content="{x:Static lang:Resources.GenerateRandomLength}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+					</Button.ToolTip>
+				</Button>
             </StackPanel>
         </Grid>
 

diff --git a/Passliss/Pages/GeneratePage.xaml.cs b/Passliss/Pages/GeneratePage.xaml.cs
@@ -27,20 +27,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using Passliss.UserControls;
 using Passliss.Windows;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Passliss.Pages
 {
@@ -95,6 +85,7 @@ public GeneratePage()
 		private void GenerateBtn_Click(object sender, RoutedEventArgs e)
 		{
 			LenghtTxt.Text = LenghtTxt.Text.Replace(" ", ""); // Remove whitespaces
+			HistoryBtn.Visibility = Visibility.Visible; // Set visibility
 			if (LenghtTxt.Text.Length <= 0 || !(int.Parse(LenghtTxt.Text) > 0))
 			{
 				MessageBox.Show(Properties.Resources.PleaseSpecifyLenghtMsg, Properties.Resources.Passliss, MessageBoxButton.OK, MessageBoxImage.Information); // Show message
@@ -208,6 +199,7 @@ internal void HistoryBtn_Click(object sender, RoutedEventArgs e)
 		{
 			if (PasswordHistory.Children.Count > 0)
 			{
+				HistoryBtn.Visibility = Visibility.Visible; // Set visibility
 				if (sender is not PasswordHistoryItem)
 				{
 					if (Header.Visibility == Visibility.Visible)
@@ -244,7 +236,7 @@ internal void HistoryBtn_Click(object sender, RoutedEventArgs e)
 				HistoryScroll.Visibility = Visibility.Collapsed; // Hide
 
 				HistoryBtn.Content = "\uF47F"; // Set text
-
+				HistoryBtn.Visibility = Visibility.Collapsed; // Set visibility
 				if (sender is not PasswordHistoryItem)
 				{
 					MessageBox.Show(Properties.Resources.HistoryEmpty, Properties.Resources.Passliss, MessageBoxButton.OK, MessageBoxImage.Information); // Show

diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml
@@ -6,12 +6,12 @@
 	  xmlns:local="clr-namespace:Passliss.Pages"
 	  xmlns:lang="clr-namespace:Passliss.Properties"
 	  mc:Ignorable="d" 
-	  FontFamily="../Fonts/#Montserrat"
+	  FontFamily="../Fonts/#Montserrat" Foreground="{Binding Source={StaticResource Foreground1}}"
 	  d:DesignHeight="450" d:DesignWidth="700"
 	  Title="SettingsPage">
 
 	<ScrollViewer HorizontalScrollBarVisibility="Hidden" Template="{DynamicResource ScrollViewerControlTemplate}" CanContentScroll="True" Height="344">
-		<Grid Height="980">
+		<Grid Height="1060">
 			<StackPanel Margin="10,40,10,10" Grid.Row="0">
 				<TextBlock Text="{x:Static lang:Resources.Settings}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="16"/>
 
@@ -99,14 +99,19 @@
 				<TextBlock Text="{x:Static lang:Resources.Startup}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Bold" FontSize="20" Margin="0,10,0,0"/>
 				<TextBlock Text="{x:Static lang:Resources.StartupPage}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="14"/>
 
-				<StackPanel	Orientation="Horizontal">
-					<ComboBox SelectionChanged="PageComboBox_SelectionChanged" BorderThickness="2" Padding="5" Style="{DynamicResource ComboBoxStyle1}" x:Name="PageComboBox" Background="Transparent" BorderBrush="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource Foreground1}}" HorizontalAlignment="Left" Margin="0,5,10,0" VerticalAlignment="Center"/>
-					<Button x:Name="PageApplyBtn" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" Padding="10,5,10,5" Style="{StaticResource TabButtonStyle}" FontWeight="Bold" Cursor="Hand" VerticalAlignment="Center" Click="PageApplyBtn_Click" Visibility="Hidden">
-						<StackPanel Orientation="Horizontal">
-							<TextBlock Text="&#xE98E;" FontWeight="Regular" FontFamily="..\Fonts\#FluentlyIcons" Margin="0,0,5,0" VerticalAlignment="Center"/>
-							<TextBlock Text="{x:Static lang:Resources.Apply}" VerticalAlignment="Center"/>
+				<StackPanel Orientation="Horizontal">
+					<Border x:Name="GeneratePageBorder" CornerRadius="10" Margin="5" Background="{Binding Source={StaticResource Background1}}" BorderThickness="3" BorderBrush="{x:Null}" MouseEnter="Border_MouseEnter_1" MouseLeave="Border_MouseLeave_1" Cursor="Hand" MouseLeftButtonUp="GeneratePageBorder_MouseLeftButtonUp">
+						<StackPanel	Orientation="Vertical">
+							<TextBlock Text="&#xFC23;" Margin="20" FontSize="64" FontFamily="..\Fonts\#FluentSystemIcons-Regular" HorizontalAlignment="Center"/>
+							<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="GeneratePageRadioBtn" Checked="GeneratePageRadioBtn_Checked" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Generate}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
 						</StackPanel>
-					</Button>
+					</Border>
+					<Border x:Name="StrengthPageBorder" CornerRadius="10" Margin="5" Background="{Binding Source={StaticResource Background1}}" BorderThickness="3" BorderBrush="{x:Null}" MouseEnter="Border_MouseEnter_1" MouseLeave="Border_MouseLeave_1" Cursor="Hand" MouseLeftButtonUp="StrengthPageBorder_MouseLeftButtonUp">
+						<StackPanel	Orientation="Vertical">
+							<TextBlock Text="&#xF6BF;" Margin="20" FontSize="64" FontFamily="..\Fonts\#FluentSystemIcons-Regular" HorizontalAlignment="Center"/>
+							<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="StrengthPageRadioBtn" Checked="StrengthPageRadioBtn_Checked" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Strenght}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
+						</StackPanel>
+					</Border>
 				</StackPanel>
 
 				<TextBlock Text="{x:Static lang:Resources.PasswordConfigurations}" Foreground="{Binding Source={StaticResource Foreground1}}" FontWeight="Bold" FontSize="20" Margin="0,10,0,0"/>