Compare commits

...

12 commits

Author SHA1 Message Date
Reza Bakhshi Laktasaraei
96c023fa9a
Merge a055108a53 into 5a0fdd971a 2025-04-30 12:27:14 +03:30
Reza Bakhshi Laktasaraei
a055108a53 Refactor ListBox in ProfilesView to use custom ItemContainerStyle
- Removed unused AccessibleMyChipListBoxItem style from UserControl.Resources.
- Added a new ItemContainerStyle directly to the ListBox (lstGroup) with the following changes:
  - Set Focusable to False to prevent tab focus.
  - Set AutomationProperties.Name to Remarks for better accessibility.
  - Used a custom ControlTemplate with a RadioButton for item selection.
This improves maintainability and ensures consistent accessibility behavior.
2025-04-29 07:06:23 +03:30
Reza Bakhshi Laktasaraei
72b5a40b95
Merge branch '2dust:master' into accessibility 2025-04-28 11:56:31 +03:30
2dust
cdde1fca09
Update Directory.Packages.props 2025-04-28 15:25:31 +08:00
Reza Bakhshi Laktasaraei
9f9092e9c7
Merge branch '2dust:master' into accessibility 2025-04-27 19:58:29 +03:30
Reza Bakhshi Laktasaraei
3f8bbb6074 Merge branch 'accessibility' of https://github.com/rezabakhshilaktasaraei/v2rayN-accessibility-improvements into accessibility 2025-04-27 19:54:45 +03:30
Reza Bakhshi Laktasaraei
9cc3122bda Update package versions and fix accessibility in ProfilesView.xaml
- Updated package versions in Directory.Packages.props:
  - Semi.Avalonia and Semi.Avalonia.DataGrid from 11.2.1.6 to 11.2.1.7.
  - ZXing.Net.Bindings.SkiaSharp from 0.16.14 to 0.16.21.
- Fixed MC3024 error in ProfilesView.xaml by creating AccessibleMyChipListBoxItem style:
  - Added AccessibleMyChipListBoxItem style based on MyChipListBoxItem to set AutomationProperties.Name.
  - Replaced ItemContainerStyle with AccessibleMyChipListBoxItem to preserve original appearance.
  - Updated AutomationProperties.Name to use resx:ResUI.menuSubscription for better localization.
  - Removed duplicate AutomationProperties.Name from TextBlock as it's now handled by the style.
2025-04-27 19:26:23 +03:30
Reza Bakhshi Laktasaraei
dafc765a82 Improve accessibility for cmbServers in StatusBarView.xaml
Added ItemContainerStyle to cmbServers to bind AutomationProperties.Name to Text, ensuring screen readers announce the correct values instead of the default object type.
2025-04-27 08:28:32 +03:30
Reza Bakhshi Laktasaraei
b62cfd9d4b Improve accessibility for ComboBoxes in StatusBarView.xaml
Added ItemContainerStyle to cmbRoutings2 and cmbRoutings to bind AutomationProperties.Name to Remarks, ensuring screen readers announce the correct values instead of the default object type.
2025-04-27 03:35:52 +03:30
Reza Bakhshi Laktasaraei
ff7fc64575
Merge branch '2dust:master' into accessibility 2025-04-26 08:43:42 +03:30
Reza Bakhshi Laktasaraei
213c0cd793
Merge branch '2dust:master' into accessibility 2025-04-25 11:26:04 +03:30
Reza Bakhshi Laktasaraei
5c38e96493 Fix Tab navigation in ToolBar by setting KeyboardNavigation to Continue 2025-04-25 10:45:58 +03:30

View file

@ -18,9 +18,6 @@
<UserControl.Resources> <UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVisConverter" /> <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
<conv:DelayColorConverter x:Key="DelayColorConverter" /> <conv:DelayColorConverter x:Key="DelayColorConverter" />
<Style x:Key="AccessibleMyChipListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource MyChipListBoxItem}">
<Setter Property="AutomationProperties.Name" Value="{Binding Remarks}" />
</Style>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<DockPanel> <DockPanel>
@ -29,7 +26,6 @@
x:Name="lstGroup" x:Name="lstGroup"
MaxHeight="200" MaxHeight="200"
FontSize="{DynamicResource StdFontSize}" FontSize="{DynamicResource StdFontSize}"
ItemContainerStyle="{StaticResource AccessibleMyChipListBoxItem}"
Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}" Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}"
AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}"> AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
@ -37,6 +33,29 @@
<TextBlock Text="{Binding Remarks}" /> <TextBlock Text="{Binding Remarks}" />
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem" BasedOn="{StaticResource MyChipListBoxItem}">
<Setter Property="Focusable" Value="False" />
<Setter Property="AutomationProperties.Name" Value="{Binding Remarks}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<RadioButton
IsChecked="{TemplateBinding IsSelected}"
Content="{TemplateBinding Content}"
AutomationProperties.Name="{Binding Remarks}">
<RadioButton.ContentTemplate>
<DataTemplate>
<TextBlock
AutomationProperties.Name="{Binding Remarks}" />
</DataTemplate>
</RadioButton.ContentTemplate>
</RadioButton>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ListBox.ItemContainerStyle>
</ListBox> </ListBox>
<Button <Button