Skip to content

ui: remove duplicate add buttons from empty states; fix subtitle wrap… #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pexatar merged 1 commit into from
May 1, 2026
Merged

ui: remove duplicate add buttons from empty states; fix subtitle wrap… #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Installer/PassKey.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
[Setup]
AppId={{A7F3C2D1-8E4B-4F9A-B6D5-3C1E7A2F0D84}
AppName=PassKey
AppVersion=1.0.4
AppVerName=PassKey 1.0.4
AppVersion=1.0.5
AppVerName=PassKey 1.0.5
AppPublisher=Giuseppe Imperato
AppPublisherURL=https://github.com/pexatar/PassKey
AppSupportURL=https://github.com/pexatar/PassKey/issues
Expand Down
4 changes: 2 additions & 2 deletions src/PassKey.Desktop/Controls/EmptyStateControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="16"
MaxWidth="400">
Spacing="16">

<FontIcon
x:Name="IconElement"
Expand All @@ -26,6 +25,7 @@
Style="{StaticResource BodyTextBlockStyle}"
HorizontalAlignment="Center"
TextAlignment="Center"
TextWrapping="NoWrap"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" />

<StackPanel
Expand Down
2 changes: 1 addition & 1 deletion src/PassKey.Desktop/Views/CreditCardsListView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
Icon="&#xE8C7;"
Title="Nessuna carta salvata"
Subtitle="Aggiungi la tua prima carta di credito per averla sempre al sicuro."
PrimaryActionText="Nuova carta" />
/>
</Grid>

<!-- Detail panel (right side, 400px) -->
Expand Down
2 changes: 0 additions & 2 deletions src/PassKey.Desktop/Views/CreditCardsListView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public async void SetViewModel(CreditCardsListViewModel vm)
// Apply localized empty-state strings (guarantees correct language on every OS locale).
EmptyState.Title = _res.GetString("EmptyCardsTitle");
EmptyState.Subtitle = _res.GetString("EmptyCardsSubtitle");
EmptyState.PrimaryActionText = _res.GetString("EmptyCardsPrimaryAction");

vm.PropertyChanged += OnViewModelPropertyChanged;
vm.SaveCompleted += ShowSavedToast;

Expand Down
3 changes: 2 additions & 1 deletion src/PassKey.Desktop/Views/IdentitiesListView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@
x:Uid="EmptyIdentities"
x:Name="EmptyState"
Visibility="Collapsed"
Margin="0,16,0,0"
Icon="&#xE77B;"
Title="Nessuna identità"
Subtitle="Aggiungi la tua prima identità per salvare dati personali, indirizzi e documenti."
PrimaryActionText="Aggiungi identità" />
/>

<!-- Identity GridView (card layout) -->
<GridView x:Name="IdentityList"
Expand Down
5 changes: 0 additions & 5 deletions src/PassKey.Desktop/Views/IdentitiesListView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public async void SetViewModel(IdentitiesListViewModel vm)
// Apply localized empty-state strings (guarantees correct language on every OS locale).
EmptyState.Title = _res.GetString("EmptyIdentitiesTitle");
EmptyState.Subtitle = _res.GetString("EmptyIdentitiesSubtitle");
EmptyState.PrimaryActionText = _res.GetString("EmptyIdentitiesPrimaryAction");

// Wire EmptyState primary action to AddNew
EmptyState.PrimaryActionCommand = new RelayCommand(() => _viewModel?.AddNewCommand.Execute(null));

await vm.LoadEntriesCommand.ExecuteAsync(null);
UpdateList();
UpdateEmptyState();
Expand Down
4 changes: 2 additions & 2 deletions src/PassKey.Desktop/Views/PasswordsListView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</Grid>

<!-- Column headers (clickable for sort) -->
<Grid Grid.Row="1" Padding="56,4,8,4" ColumnSpacing="12">
<Grid x:Name="ColumnHeadersGrid" Grid.Row="1" Padding="56,4,8,4" ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="2*" />
Expand Down Expand Up @@ -187,7 +187,7 @@
Icon="&#xE8D7;"
Title="Nessuna password salvata"
Subtitle="Aggiungi la tua prima password per iniziare a proteggere i tuoi account."
PrimaryActionText="Nuova password" />
/>
</Grid>

<!-- Detail panel (right side, 400px) -->
Expand Down
3 changes: 1 addition & 2 deletions src/PassKey.Desktop/Views/PasswordsListView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public async void SetViewModel(PasswordsListViewModel vm)
// Apply localized empty-state strings (guarantees correct language on every OS locale).
EmptyState.Title = _res.GetString("EmptyPasswordsTitle");
EmptyState.Subtitle = _res.GetString("EmptyPasswordsSubtitle");
EmptyState.PrimaryActionText = _res.GetString("EmptyPasswordsPrimaryAction");

vm.PropertyChanged += OnViewModelPropertyChanged;
vm.SaveCompleted += ShowSavedToast;

Expand Down Expand Up @@ -68,6 +66,7 @@ private void UpdateEmptyState()
if (_viewModel is null) return;
EmptyState.Visibility = _viewModel.IsEmpty ? Visibility.Visible : Visibility.Collapsed;
PasswordList.Visibility = _viewModel.IsEmpty ? Visibility.Collapsed : Visibility.Visible;
ColumnHeadersGrid.Visibility = _viewModel.IsEmpty ? Visibility.Collapsed : Visibility.Visible;
}

private void UpdateDetailPanel()
Expand Down
1 change: 0 additions & 1 deletion src/PassKey.Desktop/Views/SecureNotesListView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
Icon="&#xE70B;"
Title="Nessuna nota"
Subtitle="Crea la tua prima nota sicura per salvare informazioni riservate."
PrimaryActionText="Nuova nota"
AutomationProperties.Name="Nessuna nota. Crea la tua prima nota sicura." />

<!-- Empty state: filtro attivo ma 0 risultati -->
Expand Down
4 changes: 0 additions & 4 deletions src/PassKey.Desktop/Views/SecureNotesListView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,9 @@ public async void SetViewModel(SecureNotesListViewModel vm)
// Apply localized empty-state strings (guarantees correct language on every OS locale).
EmptyState.Title = _res.GetString("EmptyNotesTitle");
EmptyState.Subtitle = _res.GetString("EmptyNotesSubtitle");
EmptyState.PrimaryActionText = _res.GetString("EmptyNotesPrimaryAction");
FilteredEmptyState.Title = _res.GetString("EmptyFilteredTitle");
FilteredEmptyState.Subtitle = _res.GetString("EmptyFilteredSubtitle");

// Wire EmptyState primary action button
EmptyState.PrimaryActionCommand = new RelayCommand(() => _viewModel?.AddNewCommand.Execute(null));

await vm.LoadEntriesCommand.ExecuteAsync(null);
UpdateList();
UpdateEmptyState();
Expand Down
Loading