Compare commits

..

No commits in common. "master" and "v1.4" have entirely different histories.
master ... v1.4

5 changed files with 13 additions and 45 deletions

View file

@ -42,20 +42,8 @@ jobs:
--self-contained true \
-p:PublishSingleFile=true \
-p:PublishTrimmed=true \
-o ./output_linux_x64
- name: Build the project (Linux arm64)
run: |
dotnet publish ./Cryptura/Cryptura.csproj \
-c Release \
-r linux-arm64 \
--self-contained true \
-p:PublishSingleFile=true \
-p:PublishTrimmed=true \
-o ./output_linux_arm64
-o ./output_linux
- name: Build the project (Windows x64)
run: |
dotnet publish ./Cryptura/Cryptura.csproj \
@ -64,18 +52,7 @@ jobs:
--self-contained true \
-p:PublishSingleFile=true \
-p:PublishTrimmed=true \
-o ./output_win_x64
- name: Build the project (Windows arm64)
run: |
dotnet publish ./Cryptura/Cryptura.csproj \
-c Release \
-r win-arm64 \
--self-contained true \
-p:PublishSingleFile=true \
-p:PublishTrimmed=true \
-o ./output_win_arm64
-o ./output_win
- name: Download appimagetool
run: |
@ -85,7 +62,7 @@ jobs:
- name: Build AppImage
run: |
mkdir -p Cryptura.AppDir/usr/bin
cp -r ./output_linux_x64/* Cryptura.AppDir/usr/bin/
cp -r ./output_linux/* Cryptura.AppDir/usr/bin/
cp Cryptura/Assets/AppRun Cryptura.AppDir/
cp Cryptura/Assets/cryptura.desktop Cryptura.AppDir/
@ -102,11 +79,9 @@ jobs:
- name: Pack Releases into Zips
run: |
mkdir -p ./release
zip -r ./release/Cryptura_Linux_x64.zip ./output_linux_x64
zip -r ./release/Cryptura_Linux_arm64.zip ./output_linux_arm64
zip -r ./release/Cryptura_Windows_x64.zip ./output_win_x64
zip -r ./release/Cryptura_Windows_arm64.zip ./output_win_arm64
rm -rf ./output_linux_x64 ./output_linux_arm64 ./output_win_x64 ./output_win_arm64
zip -r ./release/Cryptura_Linux_x64.zip ./output_linux
zip -r ./release/Cryptura_Windows_x64.zip ./output_win
rm -rf ./output_linux ./output_win
- name: Create Git tag

View file

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

View file

@ -26,7 +26,7 @@
</ExperimentalAcrylicBorder>
<Grid>
<Border Width="1" Background="#80000000" Margin="5,20" HorizontalAlignment="Center" ZIndex="1" Name="MiddleSeperator" IsVisible="False"/>
<Border Width="1" Background="#80000000" Margin="5,10" HorizontalAlignment="Center" ZIndex="1"/>
<Border Background="#80000000" CornerRadius="10" Margin="10" Name="ContentBorder">
<ListBox Name="PasswordList" Background="Transparent" SelectionChanged="PasswordList_OnSelectionChanged"
Margin="10">
@ -46,16 +46,12 @@
Foreground="White"
Text="{Binding Name}"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
Margin="20,0"/>
<TextBlock
Grid.Column="1"
Foreground="White"
Text="{Binding DisplayValue}"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
Margin="20,0"/>
</Grid>
</Border>
@ -82,8 +78,7 @@
</ListBox>
</Border>
<Border Background="#80000000" Name="AddPasswordContainer" IsVisible="False" PointerPressed="OuterBorder_OnPointerPressed" ZIndex="11">
<Border Background="#80000000" CornerRadius="10" PointerPressed="InnerBorder_OnPointerPressed"
Name="AddPasswordBorder"
<Border Background="#2b2f36" CornerRadius="10" PointerPressed="InnerBorder_OnPointerPressed"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Height="300"

View file

@ -20,15 +20,13 @@ public partial class MainWindow : Window
this.TransparencyLevelHint = new[] { WindowTransparencyLevel.None };
this.Background = new SolidColorBrush(Color.Parse(ColorScheme.Surface.Color_1));
this.ContentBorder.Background = new SolidColorBrush(Color.Parse(ColorScheme.Surface.Color_2));
this.AddPasswordBorder.Background = new SolidColorBrush(Color.Parse(ColorScheme.Surface.Color_2));
this.MiddleSeperator.IsVisible = true;
this.AcrylicBorderObject.IsVisible = false;
AcrylicBorderObject.IsVisible = false;
}
else
{
this.TransparencyLevelHint = new[] { WindowTransparencyLevel.AcrylicBlur };
this.Background = Brushes.Transparent;
this.AcrylicBorderObject.IsVisible = true;
AcrylicBorderObject.IsVisible = true;
}
}
public MainWindow(string masterPassword)

View file

@ -9,7 +9,7 @@ public class Password
{
public string Name { get; set; }
public string Value { get; set; }
public string CensoredValue { get; set; } = "**********";
public string CensoredValue { get; set; } = "******";
public WXFile WxFile { get; set; }
public string DisplayValue