fixed missing features
All checks were successful
Java CI / test (push) Successful in 1m17s

This commit is contained in:
WeeXnes 2025-05-06 19:55:10 +02:00
parent 024570f0ed
commit 1f964b3148
6 changed files with 93 additions and 30 deletions

View file

@ -7,7 +7,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<AssemblyVersion>1.0</AssemblyVersion> <AssemblyVersion>1.0</AssemblyVersion>
<FileVersion>1.0</FileVersion> <FileVersion>1.2</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View file

@ -9,6 +9,8 @@
Background="Transparent" Background="Transparent"
Height="400" Height="400"
Width="520" Width="520"
MinHeight="340"
MinWidth="340"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Title="Cryptura"> Title="Cryptura">
<!--ExtendClientAreaToDecorationsHint="True"--> <!--ExtendClientAreaToDecorationsHint="True"-->
@ -24,8 +26,10 @@
</ExperimentalAcrylicBorder> </ExperimentalAcrylicBorder>
<Grid> <Grid>
<Border Grid.Row="0" Background="#80000000" CornerRadius="10" Margin="10" Name="ContentBorder"> <Border Width="1" Background="#80000000" Margin="5,10" HorizontalAlignment="Center" ZIndex="1"/>
<ListBox Name="PasswordList" Background="Transparent" SelectionChanged="PasswordList_OnSelectionChanged"> <Border Background="#80000000" CornerRadius="10" Margin="10" Name="ContentBorder">
<ListBox Name="PasswordList" Background="Transparent" SelectionChanged="PasswordList_OnSelectionChanged"
Margin="10">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate x:DataType="local:Password"> <DataTemplate x:DataType="local:Password">
<Border Background="Transparent" Padding="10"> <Border Background="Transparent" Padding="10">
@ -33,11 +37,22 @@
<ContextMenu> <ContextMenu>
<MenuItem Header="Add New Password" Click="CreatePassword_OnClick"/> <MenuItem Header="Add New Password" Click="CreatePassword_OnClick"/>
<MenuItem Header="Remove Password" Click="DeletePassword_OnClick"/> <MenuItem Header="Remove Password" Click="DeletePassword_OnClick"/>
<MenuItem Header="Hide/Unhide Passwords" Click="ToggleHide_OnClick"/>
</ContextMenu> </ContextMenu>
</Border.ContextMenu> </Border.ContextMenu>
<Grid ColumnDefinitions="*, *"> <Grid ColumnDefinitions="*, *">
<TextBlock Grid.Column="0" Foreground="White" Text="{Binding Name}" VerticalAlignment="Center"/> <TextBlock
<TextBlock Grid.Column="1" Foreground="White" Text="{Binding DisplayValue}" VerticalAlignment="Center"/> Grid.Column="0"
Foreground="White"
Text="{Binding Name}"
VerticalAlignment="Center"
Margin="20,0"/>
<TextBlock
Grid.Column="1"
Foreground="White"
Text="{Binding DisplayValue}"
VerticalAlignment="Center"
Margin="20,0"/>
</Grid> </Grid>
</Border> </Border>
</DataTemplate> </DataTemplate>
@ -45,12 +60,15 @@
<ListBox.ContextMenu> <ListBox.ContextMenu>
<ContextMenu> <ContextMenu>
<MenuItem Header="Add New Password" Click="CreatePassword_OnClick"/> <MenuItem Header="Add New Password" Click="CreatePassword_OnClick"/>
<MenuItem Header="Remove Password" Click="DeletePassword_OnClick"/> <MenuItem Header="Hide/Unhide Passwords" Click="ToggleHide_OnClick"/>
</ContextMenu> </ContextMenu>
</ListBox.ContextMenu> </ListBox.ContextMenu>
<ListBox.Styles> <ListBox.Styles>
<Style Selector="ListBoxItem:selected /template/ ContentPresenter"> <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
<Setter Property="Background" Value="#35313d"/> <Setter Property="Background" Value="#40000000"/>
</Style>
<Style Selector="ListBoxItem:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="#20000000"></Setter>
</Style> </Style>
<Style Selector="ListBoxItem"> <Style Selector="ListBoxItem">
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
@ -58,23 +76,39 @@
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
</ListBox> </ListBox>
</Border> </Border>
<Border Background="#80000000" Name="AddPasswordContainer" IsVisible="False"> <Border Background="#80000000" Name="AddPasswordContainer" IsVisible="False" PointerPressed="OuterBorder_OnPointerPressed" ZIndex="11">
<Border Margin="50" Background="#2b2f36" CornerRadius="10"> <Border Background="#2b2f36" CornerRadius="10" PointerPressed="InnerBorder_OnPointerPressed"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Height="300"
Width="300">
<StackPanel Spacing="10" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="20"> <StackPanel Spacing="10" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="20">
<TextBlock Text="Name:" Margin="20,0"/> <TextBlock Text="Name:" Margin="20,0"/>
<TextBox Name="PasswordName" Margin="20,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" KeyDown="DialogKeyDown"/> <TextBox Name="PasswordName"
Margin="20,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
KeyDown="DialogKeyDown"/>
<TextBlock Text="Password:" Margin="20,0"/> <TextBlock Text="Password:" Margin="20,0"/>
<TextBox Name="PasswordValue" Margin="20,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" KeyDown="DialogKeyDown"/> <TextBox Name="PasswordValue"
Margin="20,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
KeyDown="DialogKeyDown"
PasswordChar="*"/>
<TextBlock Text="Repeat Password:" Margin="20,0"/> <TextBlock Text="Repeat Password:" Margin="20,0"/>
<TextBox Name="PasswordRepeat" Margin="20,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" KeyDown="DialogKeyDown"/> <TextBox Name="PasswordRepeat"
Margin="20,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
KeyDown="DialogKeyDown"
PasswordChar="*"/>
<TextBlock Name="ErrorTextBlock" IsVisible="False" HorizontalAlignment="Center" Foreground="Crimson"/>
<Button Name="PasswordSave" Click="PasswordSave_OnClick" HorizontalAlignment="Center" VerticalAlignment="Center" <Button Name="PasswordSave" Click="PasswordSave_OnClick" HorizontalAlignment="Center" VerticalAlignment="Center"
Content="Confirm"/> Content="Confirm"/>
</StackPanel> </StackPanel>
</Border> </Border>
</Border> </Border>
</Grid> </Grid>
</Panel> </Panel>

View file

@ -45,6 +45,7 @@ public partial class MainWindow : Window
if (Path.GetExtension(file).ToLower() == ".wx") if (Path.GetExtension(file).ToLower() == ".wx")
{ {
Password pw = new Password(file); Password pw = new Password(file);
if(!String.IsNullOrEmpty(pw.Value))
passwords.Add(pw); passwords.Add(pw);
} }
else else
@ -65,11 +66,7 @@ public partial class MainWindow : Window
} }
} }
private void Button_OnClick(object? sender, RoutedEventArgs e)
{
censorPasswords = !censorPasswords;
FetchPasswords();
}
private void PasswordList_OnSelectionChanged(object? sender, SelectionChangedEventArgs e) private void PasswordList_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
@ -83,12 +80,23 @@ public partial class MainWindow : Window
private void DeletePassword_OnClick(object? sender, RoutedEventArgs e) private void DeletePassword_OnClick(object? sender, RoutedEventArgs e)
{ {
throw new NotImplementedException(); if (PasswordList.SelectedItem is Password password)
{
File.Delete(password.WxFile.Path);
FetchPasswords();
}
}
private void ToggleHide_OnClick(object? sender, RoutedEventArgs e)
{
censorPasswords = !censorPasswords;
FetchPasswords();
} }
private void ErrorMessage(string message) private void ErrorMessage(string message)
{ {
//TODO: Show Error in GUI ErrorTextBlock.Text = message;
ErrorTextBlock.IsVisible = true;
} }
private void SavePassword() private void SavePassword()
@ -110,7 +118,17 @@ public partial class MainWindow : Window
} }
Password newPassword = new Password(PasswordName.Text, PasswordValue.Text); Password newPassword = new Password(PasswordName.Text, PasswordValue.Text);
FetchPasswords(); FetchPasswords();
ResetPasswordModal();
}
private void ResetPasswordModal()
{
AddPasswordContainer.IsVisible = false; AddPasswordContainer.IsVisible = false;
PasswordName.Text = "";
PasswordValue.Text = "";
PasswordRepeat.Text = "";
ErrorTextBlock.IsVisible = false;
} }
private void PasswordSave_OnClick(object? sender, RoutedEventArgs e) private void PasswordSave_OnClick(object? sender, RoutedEventArgs e)
@ -125,4 +143,13 @@ public partial class MainWindow : Window
SavePassword(); SavePassword();
} }
} }
private void OuterBorder_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{
ResetPasswordModal();
}
private void InnerBorder_OnPointerPressed(object sender, PointerPressedEventArgs e)
{
e.Handled = true;
}
} }

View file

@ -14,7 +14,7 @@ public class Password
public string DisplayValue public string DisplayValue
{ {
get => MainWindow.censorPasswords ? Value : CensoredValue; get => MainWindow.censorPasswords ? CensoredValue : Value;
} }
public Password(string name, string value) public Password(string name, string value)

View file

@ -9,7 +9,9 @@
Title="Cryptura" Title="Cryptura"
CanResize="False" CanResize="False"
Width="430" Width="430"
Height="170"> Height="170"
Loaded="Control_OnLoaded"
WindowStartupLocation="CenterScreen">
<Panel> <Panel>
<ExperimentalAcrylicBorder IsHitTestVisible="False" Name="AcrylicBorderObject"> <ExperimentalAcrylicBorder IsHitTestVisible="False" Name="AcrylicBorderObject">
<ExperimentalAcrylicBorder.Material> <ExperimentalAcrylicBorder.Material>
@ -22,7 +24,6 @@
</ExperimentalAcrylicBorder> </ExperimentalAcrylicBorder>
<Border Background="#80000000" CornerRadius="10" Margin="10" Name="ContentBorder"> <Border Background="#80000000" CornerRadius="10" Margin="10" Name="ContentBorder">
<StackPanel Spacing="10" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="20"> <StackPanel Spacing="10" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="20">
<TextBlock Text="Enter Master password" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="Enter Master password" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Name="MasterPasswordBox" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" PasswordChar="*" KeyDown="MasterPasswordBox_OnKeyDown"/> <TextBox Name="MasterPasswordBox" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" PasswordChar="*" KeyDown="MasterPasswordBox_OnKeyDown"/>
<Button Name="MasterPasswordConfirm" Content="Confirm" Click="MasterPasswordConfirm_OnClick" HorizontalAlignment="Center" VerticalAlignment="Center"/> <Button Name="MasterPasswordConfirm" Content="Confirm" Click="MasterPasswordConfirm_OnClick" HorizontalAlignment="Center" VerticalAlignment="Center"/>

View file

@ -32,10 +32,6 @@ public partial class PasswordWindow : Window
AdjustThemeToPlatform(); AdjustThemeToPlatform();
} }
private void WindowBase_OnResized(object? sender, WindowResizedEventArgs e)
{
Console.WriteLine(e.ClientSize);
}
private void ConfirmPassword() private void ConfirmPassword()
{ {
@ -54,4 +50,9 @@ public partial class PasswordWindow : Window
ConfirmPassword(); ConfirmPassword();
} }
} }
private void Control_OnLoaded(object? sender, RoutedEventArgs e)
{
MasterPasswordBox.Focus();
}
} }