chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: rename to PinCode, add styles for size.

Browse Source
This commit is contained in:
rabbitism
2024-07-31 14:11:16 +08:00
parent 16e68061d1
commit ff666cafdc
17 changed files with 149 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
demo/Ursa.Demo/Pages/PinCodeDemo.axaml Normal file
View File

@@ -0,0 +1,25 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
xmlns:vm="using:Ursa.Demo.ViewModels"
x:DataType="vm:PinCodeDemoViewModel"
x:CompileBindings="True"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.PinCodeDemo">
<StackPanel>
<u:Form>
<u:PinCode u:FormItem.Label="Regular" Count="4" Name="v4" CompleteCommand="{Binding CompleteCommand}"/>
<u:PinCode u:FormItem.Label="Digit Only" Count="4" Mode="Digit" DataValidationErrors.Errors="{Binding Error}"/>
<u:PinCode u:FormItem.Label="Letter Only" Count="4" Mode="Letter"/>
<u:PinCode u:FormItem.Label="Password Mask" Count="6" PasswordChar="•" Complete="VerificationCode_OnComplete" />
<u:FormGroup>
<u:PinCode u:FormItem.Label="Size Small" Count="6" Classes="Small" />
<u:PinCode u:FormItem.Label="Size Default" Count="6" />
<u:PinCode u:FormItem.Label="Size Large" Count="6" Classes="Large" />
</u:FormGroup>
</u:Form>
</StackPanel>
</UserControl>

6
demo/Ursa.Demo/Pages/VerificationCodeDemo.axaml.cs → demo/Ursa.Demo/Pages/PinCodeDemo.axaml.cs
View File

@@ -3,14 +3,14 @@ using Ursa.Controls;
namespace Ursa.Demo.Pages; namespace Ursa.Demo.Pages;
public partial class VerificationCodeDemo : UserControl public partial class PinCodeDemo : UserControl
{ {
public VerificationCodeDemo() public PinCodeDemo()
{ {
InitializeComponent(); InitializeComponent();
} }
private async void VerificationCode_OnComplete(object? _, VerificationCodeCompleteEventArgs e) private async void VerificationCode_OnComplete(object? _, PinCodeCompleteEventArgs e)
{ {
var text = string.Join(string.Empty, e.Code); var text = string.Join(string.Empty, e.Code);
await MessageBox.ShowOverlayAsync(text); await MessageBox.ShowOverlayAsync(text);

17
demo/Ursa.Demo/Pages/VerificationCodeDemo.axaml
View File

@@ -1,17 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
xmlns:vm="using:Ursa.Demo.ViewModels"
x:DataType="vm:VerificationCodeDemoViewModel"
x:CompileBindings="True"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.VerificationCodeDemo">
<StackPanel>
<u:VerificationCode Count="4" Name="v4" CompleteCommand="{Binding CompleteCommand}"/>
<u:VerificationCode Count="4" Mode="Digit" DataValidationErrors.Errors="{Binding Error}"/>
<u:VerificationCode Count="4" Mode="Letter"/>
<u:VerificationCode Count="6" PasswordChar="•" Complete="VerificationCode_OnComplete" />
</StackPanel>
</UserControl>

2
demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
View File

@@ -67,7 +67,7 @@ public class MainViewViewModel : ViewModelBase
MenuKeys.MenuKeyThemeToggler => new ThemeTogglerDemoViewModel(), MenuKeys.MenuKeyThemeToggler => new ThemeTogglerDemoViewModel(),
MenuKeys.MenuKeyToolBar => new ToolBarDemoViewModel(), MenuKeys.MenuKeyToolBar => new ToolBarDemoViewModel(),
MenuKeys.MenuKeyTimeBox => new TimeBoxDemoViewModel(), MenuKeys.MenuKeyTimeBox => new TimeBoxDemoViewModel(),
MenuKeys.MenuKeyVerificationCode => new VerificationCodeDemoViewModel(), MenuKeys.MenuKeyPinCode => new PinCodeDemoViewModel(),
_ => throw new ArgumentOutOfRangeException(nameof(s), s, null) _ => throw new ArgumentOutOfRangeException(nameof(s), s, null)
}; };
} }

4
demo/Ursa.Demo/ViewModels/MenuViewModel.cs
View File

@@ -40,6 +40,7 @@ public class MenuViewModel: ViewModelBase
new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown }, new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown },
new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad }, new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad },
new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination }, new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
new() { MenuHeader = "PinCode", Key = MenuKeys.MenuKeyPinCode},
new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider }, new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating, Status = "New"}, new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating, Status = "New"},
new() { MenuHeader = "Scroll To", Key = MenuKeys.MenuKeyScrollToButton }, new() { MenuHeader = "Scroll To", Key = MenuKeys.MenuKeyScrollToButton },
@@ -53,7 +54,6 @@ public class MenuViewModel: ViewModelBase
new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon}, new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon},
new() { MenuHeader = "ToolBar", Key = MenuKeys.MenuKeyToolBar }, new() { MenuHeader = "ToolBar", Key = MenuKeys.MenuKeyToolBar },
new() { MenuHeader = "Time Box", Key = MenuKeys.MenuKeyTimeBox }, new() { MenuHeader = "Time Box", Key = MenuKeys.MenuKeyTimeBox },
new() { MenuHeader = "Verification Code", Key = MenuKeys.MenuKeyVerificationCode},
}; };
} }
} }
@@ -101,7 +101,7 @@ public static class MenuKeys
public const string MenuKeyThemeToggler = "ThemeToggler"; public const string MenuKeyThemeToggler = "ThemeToggler";
public const string MenuKeyTreeComboBox = "TreeComboBox"; public const string MenuKeyTreeComboBox = "TreeComboBox";
public const string MenuKeyToolBar = "ToolBar"; public const string MenuKeyToolBar = "ToolBar";
public const string MenuKeyVerificationCode = "VerificationCode"; public const string MenuKeyPinCode = "PinCode";
public const string MenuKeyTimeBox = "TimeBox"; public const string MenuKeyTimeBox = "TimeBox";
} }

4
demo/Ursa.Demo/ViewModels/VerificationCodeDemoViewModel.cs → demo/Ursa.Demo/ViewModels/PinCodeDemoViewModel.cs
View File

@@ -8,12 +8,12 @@ using Ursa.Controls;
namespace Ursa.Demo.ViewModels; namespace Ursa.Demo.ViewModels;
public partial class VerificationCodeDemoViewModel: ObservableObject public partial class PinCodeDemoViewModel: ObservableObject
{ {
public ICommand CompleteCommand { get; set; } public ICommand CompleteCommand { get; set; }
[ObservableProperty] private List<Exception>? _error; [ObservableProperty] private List<Exception>? _error;
public VerificationCodeDemoViewModel() public PinCodeDemoViewModel()
{ {
CompleteCommand = new AsyncRelayCommand<IList<string>>(OnComplete); CompleteCommand = new AsyncRelayCommand<IList<string>>(OnComplete);
Error = [new Exception("Invalid verification code")]; Error = [new Exception("Invalid verification code")];

3
src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
View File

@@ -17,7 +17,8 @@ internal class ClassHelper: AvaloniaObject
private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value) private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value)
{ {
string classes = value.GetNewValue<string>(); string? classes = value.GetNewValue<string?>();
if (classes is null) return;
sender.Classes.Clear(); sender.Classes.Clear();
sender.Classes.Add(classes); sender.Classes.Add(classes);
} }

54
src/Ursa.Themes.Semi/Controls/VerificationCode.axaml → src/Ursa.Themes.Semi/Controls/PinCode.axaml
View File

@@ -3,24 +3,23 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="https://irihi.tech/ursa"> xmlns:u="https://irihi.tech/ursa">
<Design.PreviewWith> <Design.PreviewWith>
<u:VerificationCode Count="4" /> <u:PinCode Count="4" />
</Design.PreviewWith> </Design.PreviewWith>
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:VerificationCodeItem}" TargetType="u:VerificationCodeItem"> <ControlTheme x:Key="{x:Type u:PinCodeItem}" TargetType="u:PinCodeItem">
<Setter Property="Margin" Value="8" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Focusable" Value="True" /> <Setter Property="Focusable" Value="True" />
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="Width" Value="48" /> <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="CornerRadius" Value="3" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}"></Setter>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="PART_Background" Name="PART_Background"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource TextBoxDefaultBackground}" Background="{TemplateBinding Background}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<TextPresenter <TextPresenter
@@ -45,34 +44,43 @@
<Style Selector="^:focus:error /template/ Border#PART_Background"> <Style Selector="^:focus:error /template/ Border#PART_Background">
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
</Style> </Style>
<Style Selector="^.Large">
<Setter Property="Height" Value="{DynamicResource TextBoxLargeHeight}" />
<Setter Property="Width" Value="{DynamicResource TextBoxLargeHeight}" />
</Style>
<Style Selector="^.Small">
<Setter Property="Height" Value="{DynamicResource TextBoxSmallHeight}" />
<Setter Property="Width" Value="{DynamicResource TextBoxSmallHeight}" />
</Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="{x:Type u:VerificationCodeCollection}" TargetType="u:VerificationCodeCollection"> <ControlTheme x:Key="{x:Type u:PinCodeCollection}" TargetType="u:PinCodeCollection">
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:VerificationCodeCollection"> <ControlTemplate TargetType="u:PinCodeCollection">
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" /> <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="{x:Type u:VerificationCode}" TargetType="u:VerificationCode"> <ControlTheme x:Key="{x:Type u:PinCode}" TargetType="u:PinCode">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:VerificationCode"> <ControlTemplate TargetType="u:PinCode">
<DataValidationErrors> <DataValidationErrors>
<u:VerificationCodeCollection HorizontalAlignment="Left" Name="{x:Static u:VerificationCode.PART_ItemsControl}" ItemsSource="{TemplateBinding Digits}"> <u:PinCodeCollection HorizontalAlignment="Left" Name="{x:Static u:PinCode.PART_ItemsControl}" ItemsSource="{TemplateBinding Digits}">
<u:VerificationCodeCollection.ItemsPanel> <u:PinCodeCollection.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<UniformGrid Columns="{TemplateBinding Count}" Rows="1" /> <StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</u:VerificationCodeCollection.ItemsPanel> </u:PinCodeCollection.ItemsPanel>
<u:VerificationCodeCollection.ItemContainerTheme> <u:PinCodeCollection.ItemContainerTheme>
<ControlTheme BasedOn="{StaticResource {x:Type u:VerificationCodeItem}}" TargetType="u:VerificationCodeItem"> <ControlTheme BasedOn="{StaticResource {x:Type u:PinCodeItem}}" TargetType="u:PinCodeItem">
<Setter Property="PasswordChar" Value="{Binding $parent[u:VerificationCode].PasswordChar}" /> <Setter Property="PasswordChar" Value="{Binding $parent[u:PinCode].PasswordChar}" />
<Setter Property="DataValidationErrors.Errors" Value="{Binding $parent[u:VerificationCode].(DataValidationErrors.Errors)}" /> <Setter Property="DataValidationErrors.Errors" Value="{Binding $parent[u:PinCode].(DataValidationErrors.Errors)}" />
</ControlTheme> </ControlTheme>
</u:VerificationCodeCollection.ItemContainerTheme> </u:PinCodeCollection.ItemContainerTheme>
</u:VerificationCodeCollection> </u:PinCodeCollection>
</DataValidationErrors> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

2
src/Ursa.Themes.Semi/Controls/_index.axaml
View File

@@ -48,6 +48,6 @@
<ResourceInclude Source="ToolBar.axaml" /> <ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TimeBox.axaml"/> <ResourceInclude Source="TimeBox.axaml"/>
<ResourceInclude Source="UrsaWindow.axaml"/> <ResourceInclude Source="UrsaWindow.axaml"/>
<ResourceInclude Source="VerificationCode.axaml" /> <ResourceInclude Source="PinCode.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

33
src/Ursa.Themes.Semi/Styles/PinCode.axaml Normal file
View File

@@ -0,0 +1,33 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="https://irihi.tech/ursa"
xmlns:theme="https://irihi.tech/ursa/themes/semi">
<Design.PreviewWith>
<Border Padding="20">
<!-- Add Controls for Previewer Here -->
</Border>
</Design.PreviewWith>
<!-- Add Styles Here -->
<Style Selector="u|PinCode">
<Style Selector="^ u|PinCodeItem:nth-last-child(n+2)">
<Setter Property="Margin" Value="0 0 8 0"></Setter>
</Style>
</Style>
<Style Selector="u|PinCode.Small">
<Style Selector="^ u|PinCodeItem">
<Setter Property="theme:ClassHelper.Classes" Value="Small"></Setter>
<Style Selector="^:nth-last-child(n+2)">
<Setter Property="Margin" Value="0 0 6 0"></Setter>
</Style>
</Style>
</Style>
<Style Selector="u|PinCode.Large">
<Style Selector="^ u|PinCodeItem">
<Setter Property="theme:ClassHelper.Classes" Value="Large"></Setter>
<Style Selector="^:nth-last-child(n+2)">
<Setter Property="Margin" Value="0 0 12 0"></Setter>
</Style>
</Style>
</Style>
</Styles>

1
src/Ursa.Themes.Semi/Styles/_index.axaml
View File

@@ -6,6 +6,7 @@
</Design.PreviewWith> </Design.PreviewWith>
<StyleInclude Source="Breadcrumb.axaml" /> <StyleInclude Source="Breadcrumb.axaml" />
<StyleInclude Source="ButtonGroup.axaml" /> <StyleInclude Source="ButtonGroup.axaml" />
<StyleInclude Source="PinCode.axaml" />
<StyleInclude Source="Skeleton.axaml" /> <StyleInclude Source="Skeleton.axaml" />
<StyleInclude Source="ToolBar.axaml"/> <StyleInclude Source="ToolBar.axaml"/>
<StyleInclude Source="TimeBox.axaml"/> <StyleInclude Source="TimeBox.axaml"/>

62
src/Ursa/Controls/VerificationCode/VerificationCode.cs → src/Ursa/Controls/PinCode/PinCode.cs
View File

@@ -5,18 +5,19 @@ using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.LogicalTree;
using Irihi.Avalonia.Shared.Helpers; using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls; namespace Ursa.Controls;
[TemplatePart(PART_ItemsControl, typeof(ItemsControl))] [TemplatePart(PART_ItemsControl, typeof(ItemsControl))]
public class VerificationCode: TemplatedControl public class PinCode: TemplatedControl
{ {
public const string PART_ItemsControl = "PART_ItemsControl"; public const string PART_ItemsControl = "PART_ItemsControl";
private ItemsControl? _itemsControl; private ItemsControl? _itemsControl;
private int _currentIndex; private int _currentIndex;
public static readonly StyledProperty<ICommand?> CompleteCommandProperty = AvaloniaProperty.Register<VerificationCode, ICommand?>( public static readonly StyledProperty<ICommand?> CompleteCommandProperty = AvaloniaProperty.Register<PinCode, ICommand?>(
nameof(CompleteCommand)); nameof(CompleteCommand));
public ICommand? CompleteCommand public ICommand? CompleteCommand
@@ -25,7 +26,7 @@ public class VerificationCode: TemplatedControl
set => SetValue(CompleteCommandProperty, value); set => SetValue(CompleteCommandProperty, value);
} }
public static readonly StyledProperty<int> CountProperty = AvaloniaProperty.Register<VerificationCode, int>( public static readonly StyledProperty<int> CountProperty = AvaloniaProperty.Register<PinCode, int>(
nameof(Count)); nameof(Count));
public int Count public int Count
@@ -35,7 +36,7 @@ public class VerificationCode: TemplatedControl
} }
public static readonly StyledProperty<char> PasswordCharProperty = public static readonly StyledProperty<char> PasswordCharProperty =
AvaloniaProperty.Register<VerificationCode, char>( AvaloniaProperty.Register<PinCode, char>(
nameof(PasswordChar)); nameof(PasswordChar));
public char PasswordChar public char PasswordChar
@@ -44,17 +45,17 @@ public class VerificationCode: TemplatedControl
set => SetValue(PasswordCharProperty, value); set => SetValue(PasswordCharProperty, value);
} }
public static readonly StyledProperty<VerificationCodeMode> ModeProperty = public static readonly StyledProperty<PinCodeMode> ModeProperty =
AvaloniaProperty.Register<VerificationCode, VerificationCodeMode>( AvaloniaProperty.Register<PinCode, PinCodeMode>(
nameof(Mode), defaultValue: VerificationCodeMode.Digit | VerificationCodeMode.Letter); nameof(Mode), defaultValue: PinCodeMode.Digit | PinCodeMode.Letter);
public VerificationCodeMode Mode public PinCodeMode Mode
{ {
get => GetValue(ModeProperty); get => GetValue(ModeProperty);
set => SetValue(ModeProperty, value); set => SetValue(ModeProperty, value);
} }
public static readonly DirectProperty<VerificationCode, IList<string>> DigitsProperty = AvaloniaProperty.RegisterDirect<VerificationCode, IList<string>>( public static readonly DirectProperty<PinCode, IList<string>> DigitsProperty = AvaloniaProperty.RegisterDirect<PinCode, IList<string>>(
nameof(Digits), o => o.Digits); nameof(Digits), o => o.Digits);
private IList<string> _digits = []; private IList<string> _digits = [];
@@ -64,23 +65,23 @@ public class VerificationCode: TemplatedControl
private set => SetAndRaise(DigitsProperty, ref _digits, value); private set => SetAndRaise(DigitsProperty, ref _digits, value);
} }
public static readonly RoutedEvent<VerificationCodeCompleteEventArgs> CompleteEvent = public static readonly RoutedEvent<PinCodeCompleteEventArgs> CompleteEvent =
RoutedEvent.Register<VerificationCode, VerificationCodeCompleteEventArgs>( RoutedEvent.Register<PinCode, PinCodeCompleteEventArgs>(
nameof(Complete), RoutingStrategies.Bubble); nameof(Complete), RoutingStrategies.Bubble);
public event EventHandler<VerificationCodeCompleteEventArgs> Complete public event EventHandler<PinCodeCompleteEventArgs> Complete
{ {
add => AddHandler(CompleteEvent, value); add => AddHandler(CompleteEvent, value);
remove => RemoveHandler(CompleteEvent, value); remove => RemoveHandler(CompleteEvent, value);
} }
static VerificationCode() static PinCode()
{ {
CountProperty.Changed.AddClassHandler<VerificationCode, int>((code, args) => code.OnCountOfDigitChanged(args)); CountProperty.Changed.AddClassHandler<PinCode, int>((code, args) => code.OnCountOfDigitChanged(args));
FocusableProperty.OverrideDefaultValue<VerificationCode>(true); FocusableProperty.OverrideDefaultValue<PinCode>(true);
} }
public VerificationCode() public PinCode()
{ {
InputMethod.SetIsInputMethodEnabled(this, false); InputMethod.SetIsInputMethodEnabled(this, false);
} }
@@ -103,18 +104,21 @@ public class VerificationCode: TemplatedControl
private void OnControlPressed(object? sender, PointerPressedEventArgs e) private void OnControlPressed(object? sender, PointerPressedEventArgs e)
{ {
if (e.Source is Control) if (e.Source is Control t)
{ {
/*
var item = t.FindLogicalAncestorOfType<VerificationCodeItem>(); var item = t.FindLogicalAncestorOfType<PinCodeItem>();
if (item != null) if (item != null)
{ {
item.Focus(); item.Focus();
_currentIndex = _itemsControl?.IndexFromContainer(item) ?? 0; _currentIndex = _itemsControl?.IndexFromContainer(item) ?? 0;
} }
*/ else
_currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1); {
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus(); _currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1);
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
} }
e.Handled = true; e.Handled = true;
} }
@@ -124,7 +128,7 @@ public class VerificationCode: TemplatedControl
base.OnTextInput(e); base.OnTextInput(e);
if (e.Text?.Length == 1 && _currentIndex < Count) if (e.Text?.Length == 1 && _currentIndex < Count)
{ {
var presenter = _itemsControl?.ContainerFromIndex(_currentIndex) as VerificationCodeItem; var presenter = _itemsControl?.ContainerFromIndex(_currentIndex) as PinCodeItem;
if (presenter is null) return; if (presenter is null) return;
char c = e.Text[0]; char c = e.Text[0];
if (!Valid(c, this.Mode)) return; if (!Valid(c, this.Mode)) return;
@@ -135,20 +139,20 @@ public class VerificationCode: TemplatedControl
if (_currentIndex == Count) if (_currentIndex == Count)
{ {
CompleteCommand?.Execute(Digits); CompleteCommand?.Execute(Digits);
RaiseEvent(new VerificationCodeCompleteEventArgs(Digits, CompleteEvent)); RaiseEvent(new PinCodeCompleteEventArgs(Digits, CompleteEvent));
} }
} }
} }
private bool Valid(char c, VerificationCodeMode mode) private bool Valid(char c, PinCodeMode mode)
{ {
bool isDigit = char.IsDigit(c); bool isDigit = char.IsDigit(c);
bool isLetter = char.IsLetter(c); bool isLetter = char.IsLetter(c);
return mode switch return mode switch
{ {
VerificationCodeMode.Digit => isDigit, PinCodeMode.Digit => isDigit,
VerificationCodeMode.Letter => isLetter, PinCodeMode.Letter => isLetter,
VerificationCodeMode.Digit | VerificationCodeMode.Letter => isDigit || isLetter, PinCodeMode.Digit | PinCodeMode.Letter => isDigit || isLetter,
_ => true _ => true
}; };
} }
@@ -159,7 +163,7 @@ public class VerificationCode: TemplatedControl
if (e.Key == Key.Back && _currentIndex >= 0) if (e.Key == Key.Back && _currentIndex >= 0)
{ {
_currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1); _currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1);
var presenter = _itemsControl?.ContainerFromIndex(_currentIndex) as VerificationCodeItem; var presenter = _itemsControl?.ContainerFromIndex(_currentIndex) as PinCodeItem;
if (presenter is null) return; if (presenter is null) return;
Digits[_currentIndex] = string.Empty; Digits[_currentIndex] = string.Empty;
presenter.Text = string.Empty; presenter.Text = string.Empty;

6
src/Ursa/Controls/VerificationCode/VerificationCodeCollection.cs → src/Ursa/Controls/PinCode/PinCodeCollection.cs
View File

@@ -3,16 +3,16 @@ using Avalonia.Input;
namespace Ursa.Controls; namespace Ursa.Controls;
public class VerificationCodeCollection: ItemsControl public class PinCodeCollection: ItemsControl
{ {
protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey) protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey)
{ {
return NeedsContainer<VerificationCodeItem>(item, out recycleKey); return NeedsContainer<PinCodeItem>(item, out recycleKey);
} }
protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey) protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey)
{ {
return new VerificationCodeItem() return new PinCodeItem()
{ {
[InputMethod.IsInputMethodEnabledProperty] = false, [InputMethod.IsInputMethodEnabledProperty] = false,
}; };

8
src/Ursa/Controls/PinCode/PinCodeCompleteEventArgs.cs Normal file
View File

@@ -0,0 +1,8 @@
using Avalonia.Interactivity;
namespace Ursa.Controls;
public class PinCodeCompleteEventArgs(IList<string> code, RoutedEvent? @event) : RoutedEventArgs(@event)
{
public IList<string> Code { get; } = code;
}

6
src/Ursa/Controls/VerificationCode/VerificationCodeItem.cs → src/Ursa/Controls/PinCode/PinCodeItem.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Data;
namespace Ursa.Controls; namespace Ursa.Controls;
public class VerificationCodeItem: TemplatedControl public class PinCodeItem: TemplatedControl
{ {
public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<VerificationCodeItem, string>( public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<PinCodeItem, string>(
nameof(Text), defaultBindingMode: BindingMode.TwoWay); nameof(Text), defaultBindingMode: BindingMode.TwoWay);
public string Text public string Text
@@ -15,7 +15,7 @@ public class VerificationCodeItem: TemplatedControl
set => SetValue(TextProperty, value); set => SetValue(TextProperty, value);
} }
public static readonly StyledProperty<char> PasswordCharProperty = AvaloniaProperty.Register<VerificationCodeItem, char>( public static readonly StyledProperty<char> PasswordCharProperty = AvaloniaProperty.Register<PinCodeItem, char>(
nameof(PasswordChar), defaultBindingMode: BindingMode.TwoWay); nameof(PasswordChar), defaultBindingMode: BindingMode.TwoWay);
public char PasswordChar public char PasswordChar

2
src/Ursa/Controls/VerificationCode/VerificationCodeMode.cs → src/Ursa/Controls/PinCode/PinCodeMode.cs
View File

@@ -1,7 +1,7 @@
namespace Ursa.Controls; namespace Ursa.Controls;
[Flags] [Flags]
public enum VerificationCodeMode public enum PinCodeMode
{ {
Letter = 1, Letter = 1,
Digit = 2, Digit = 2,

8
src/Ursa/Controls/VerificationCode/VerificationCodeCompleteEventArgs.cs
View File

@@ -1,8 +0,0 @@
using Avalonia.Interactivity;
namespace Ursa.Controls;
public class VerificationCodeCompleteEventArgs(IList<string> code, RoutedEvent? @event) : RoutedEventArgs(@event)
{
public IList<string> Code { get; } = code;
}