From 15fb5a2d1b31c69c869be56897a56c26f6d77a0b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Tue, 30 Jul 2024 18:33:30 +0800 Subject: [PATCH] feat: clean up warnings. --- demo/Sandbox/App.axaml.cs | 1 - demo/Ursa.Demo.iOS/AppDelegate.cs | 3 - .../Ursa.Demo/Converters/IconNameConverter.cs | 4 +- .../Converters/IconNameToPathConverter.cs | 15 ++-- .../Converters/TimelineIconConverter.cs | 5 +- .../ToolBarItemTemplateSelector.cs | 8 +-- demo/Ursa.Demo/DataTemplates/ViewLocator.cs | 8 +-- .../Dialogs/DialogWithAction.axaml.cs | 4 +- demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs | 4 +- demo/Ursa.Demo/Pages/AvatarDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/BadgeDemo.axaml.cs | 1 - demo/Ursa.Demo/Pages/BannerDemo.axaml.cs | 5 +- demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/ClassInputDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/ClockDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs | 6 +- demo/Ursa.Demo/Pages/DialogDemo.axaml.cs | 2 - .../Pages/DisableContainerDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/DividerDemo.axaml.cs | 1 - demo/Ursa.Demo/Pages/DrawerDemo.axaml | 1 - demo/Ursa.Demo/Pages/DrawerDemo.axaml.cs | 2 - .../Ursa.Demo/Pages/EnumSelectorDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/FormDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/IPv4BoxDemo.axaml.cs | 5 -- demo/Ursa.Demo/Pages/IconButtonDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs | 3 - demo/Ursa.Demo/Pages/IntroductionDemo.axaml | 1 - .../Ursa.Demo/Pages/IntroductionDemo.axaml.cs | 2 - .../Pages/KeyGestureInputDemo.axaml.cs | 7 -- demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs | 1 - demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs | 4 +- .../Pages/MultiComboBoxDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs | 18 +---- demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs | 5 +- .../Pages/NumberDisplayerDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml | 8 +-- .../Pages/NumericUpDownDemo.axaml.cs | 11 ++- demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs | 2 - .../Pages/ScrollToButtonDemo.axaml.cs | 2 - .../Ursa.Demo/Pages/SelectionBoxDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/TagInputDemo.axaml.cs | 2 - .../Ursa.Demo/Pages/ThemeTogglerDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/TimeBoxDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/TimePickerDemo.axaml.cs | 4 +- demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs | 2 - demo/Ursa.Demo/Pages/ToolBarDemo.axaml.cs | 4 +- .../Ursa.Demo/Pages/TreeComboBoxDemo.axaml.cs | 2 - .../Pages/TwoTonePathIconDemo.axaml.cs | 4 +- .../Pages/VerificationCodeDemo.axaml | 1 - .../Pages/VerificationCodeDemo.axaml.cs | 7 +- .../ViewModels/BreadcrumbDemoViewModel.cs | 29 ++++---- .../ViewModels/DialogDemoViewModel.cs | 2 - .../ViewModels/EnumSelectorDemoViewModel.cs | 2 - .../Ursa.Demo/ViewModels/FormDemoViewModel.cs | 4 +- .../Ursa.Demo/ViewModels/MainViewViewModel.cs | 4 +- .../Ursa.Demo/ViewModels/MenuItemViewModel.cs | 12 ++-- .../ViewModels/MessageBoxDemoViewModel.cs | 2 +- .../ViewModels/NumericUpDownDemoViewModel.cs | 69 ++++++++----------- .../ViewModels/PaginationDemoViewModel.cs | 3 - .../ViewModels/SkeletonDemoViewModel.cs | 8 +-- .../ViewModels/TimeBoxDemoViewModel.cs | 1 - .../ViewModels/ToolBarDemoViewModel.cs | 49 +++++++------ .../VerificationCodeDemoViewModel.cs | 1 - demo/Ursa.Demo/Views/MainView.axaml.cs | 13 ---- demo/Ursa.Demo/Views/MainWindow.axaml.cs | 3 - demo/Ursa.Demo/Views/SingleView.axaml.cs | 2 - demo/Ursa.PrismDialogDemo/App.axaml.cs | 1 - .../DefaultDialog.axaml.cs | 4 +- demo/Ursa.PrismDialogDemo/MainWindow.axaml.cs | 4 +- .../IUrsaOverlayDialogService.cs | 3 +- src/Ursa.Themes.Semi/Controls/Badge.axaml | 2 +- src/Ursa.Themes.Semi/Controls/Banner.axaml | 24 +++---- .../Controls/DatePicker.axaml | 1 - src/Ursa.Themes.Semi/Controls/Dialog.axaml | 1 - src/Ursa.Themes.Semi/Controls/Drawer.axaml | 1 - src/Ursa.Themes.Semi/Controls/IPv4Box.axaml | 4 +- .../Controls/IconButton.axaml | 2 +- src/Ursa.Themes.Semi/Controls/Loading.axaml | 12 ++-- .../Controls/NumberDisplayer.axaml | 1 - .../Controls/Pagination.axaml | 12 ++-- src/Ursa.Themes.Semi/Controls/TagInput.axaml | 4 +- .../Controls/TimePicker.axaml | 1 - src/Ursa.Themes.Semi/Controls/Timeline.axaml | 2 +- .../Converters/BooleansToOpacityConverter.cs | 4 +- .../Converters/BrushToColorConverter.cs | 5 +- .../Converters/ClockHandLengthConverter.cs | 4 +- ...melineItemTypeToIconForegroundConverter.cs | 3 +- src/Ursa.Themes.Semi/Index.axaml.cs | 4 +- src/Ursa/Controls/Badge.cs | 4 +- src/Ursa/Controls/Banner/Banner.cs | 4 +- .../Controls/Breadcrumb/BreadcrumbItem.cs | 1 - src/Ursa/Controls/Buttons/ButtonGroup.cs | 4 -- src/Ursa/Controls/Buttons/IconButton.cs | 1 - src/Ursa/Controls/Clock/Clock.cs | 12 +++- src/Ursa/Controls/ComboBox/MultiComboBox.cs | 4 +- .../Controls/ComboBox/MultiComboBoxItem.cs | 3 +- .../Controls/ComboBox/TreeComboBoxItem.cs | 9 +-- .../ControlClassesInput.cs | 30 ++++---- .../DateTimePicker/CalendarDayButton.cs | 1 - .../Controls/DateTimePicker/CalendarView.cs | 28 ++++---- .../DateTimePicker/CalendarYearButton.cs | 1 - .../Controls/DateTimePicker/DatePicker.cs | 14 ++-- .../DateTimePicker/DateRangePicker.cs | 50 +++++++------- .../Controls/DateTimePicker/DateTimeHelper.cs | 2 +- .../Controls/DateTimePicker/TimePicker.cs | 6 +- .../DateTimePicker/TimePickerPresenter.cs | 14 ++-- .../DateTimePicker/TimeRangePicker.cs | 11 ++- .../DateTimePicker/UrsaDateTimeScrollPanel.cs | 6 -- .../Controls/Dialog/CustomDialogControl.cs | 12 +--- .../Controls/Dialog/DefaultDialogControl.cs | 5 +- .../Controls/Dialog/DefaultDialogWindow.cs | 14 ++-- src/Ursa/Controls/Dialog/DialogControlBase.cs | 4 +- src/Ursa/Controls/Dialog/DialogWindow.cs | 5 +- src/Ursa/Controls/Dialog/OverlayDialog.cs | 1 - .../DisableContainer/DisableContainer.cs | 1 - .../Controls/Drawer/DefaultDrawerControl.cs | 1 - src/Ursa/Controls/Drawer/DrawerControlBase.cs | 5 +- src/Ursa/Controls/DualBadge.cs | 6 +- .../Controls/EnumSelector/EnumSelector.cs | 3 +- src/Ursa/Controls/Form/FormGroup.cs | 3 +- src/Ursa/Controls/Form/FormItem.cs | 1 - src/Ursa/Controls/IPv4Box.cs | 27 ++++---- src/Ursa/Controls/Icons/TwoTonePathIcon.cs | 3 +- src/Ursa/Controls/ImageViewer/ImageViewer.cs | 46 +++---------- src/Ursa/Controls/KeyGestureInput.cs | 1 - .../Controls/MessageBox/MessageBoxControl.cs | 10 +-- .../Controls/MessageBox/MessageBoxWindow.cs | 32 +++------ src/Ursa/Controls/NavMenu/NavMenu.cs | 6 +- src/Ursa/Controls/NavMenu/NavMenuItem.cs | 5 +- src/Ursa/Controls/NumPad/NumPad.cs | 7 +- .../NumberDisplayer/NumberDisplayerBase.cs | 10 ++- src/Ursa/Controls/NumericUpDown/IntUpDown.cs | 6 +- .../NumericUpDown/NumericUpDownBase.cs | 26 +++---- .../OverlayShared/OverlayDialogHost.Dialog.cs | 34 ++++----- .../OverlayShared/OverlayDialogHost.Drawer.cs | 14 ++-- .../OverlayShared/OverlayDialogHost.Shared.cs | 28 +++----- .../OverlayShared/OverlayFeedbackElement.cs | 8 +-- src/Ursa/Controls/Pagination/Pagination.cs | 10 +-- .../Controls/Pagination/PaginationButton.cs | 2 - src/Ursa/Controls/RangeSlider/RangeSlider.cs | 7 +- src/Ursa/Controls/RangeSlider/RangeTrack.cs | 25 +++---- src/Ursa/Controls/ScrollTo/ScrollTo.cs | 4 +- src/Ursa/Controls/ScrollTo/ScrollToButton.cs | 7 +- .../Controls/SelectionList/SelectionList.cs | 3 +- .../SelectionList/SelectionListItem.cs | 5 +- src/Ursa/Controls/Skeleton.cs | 3 - src/Ursa/Controls/TagInput/TagInput.cs | 23 ++++--- .../ThemeSelector/ThemeSelectorBase.cs | 5 +- .../ThemeSelector/ThemeToggleButton.cs | 3 +- src/Ursa/Controls/TimeBox.cs | 18 +++-- src/Ursa/Controls/Timeline/Timeline.cs | 21 ++---- .../Timeline/TimelineFormatConverter.cs | 2 +- src/Ursa/Controls/Timeline/TimelineItem.cs | 2 - src/Ursa/Controls/Timeline/TimelinePanel.cs | 1 - src/Ursa/Controls/TitleBar/CaptionButtons.cs | 11 ++- src/Ursa/Controls/TitleBar/TitleBar.cs | 6 +- src/Ursa/Controls/ToolBar/ToolBar.cs | 2 - src/Ursa/Controls/ToolBar/ToolBarSeparator.cs | 1 - .../VerificationCode/VerificationCode.cs | 14 ++-- .../VerificationCodeCollection.cs | 6 +- .../VerificationCodeCompleteEventArgs.cs | 1 - src/Ursa/Converters/CornerRadiusConverter.cs | 26 +++---- src/Ursa/Converters/DivideByTwoConverter.cs | 2 +- src/Ursa/Converters/ThicknessConverter.cs | 40 ++++------- src/Ursa/Windows/UrsaWindow.cs | 1 - 167 files changed, 473 insertions(+), 825 deletions(-) diff --git a/demo/Sandbox/App.axaml.cs b/demo/Sandbox/App.axaml.cs index c6033ba..3ead0df 100644 --- a/demo/Sandbox/App.axaml.cs +++ b/demo/Sandbox/App.axaml.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Data.Core; using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; using Sandbox.ViewModels; diff --git a/demo/Ursa.Demo.iOS/AppDelegate.cs b/demo/Ursa.Demo.iOS/AppDelegate.cs index a565165..2954d1a 100644 --- a/demo/Ursa.Demo.iOS/AppDelegate.cs +++ b/demo/Ursa.Demo.iOS/AppDelegate.cs @@ -1,9 +1,6 @@ using Foundation; -using UIKit; using Avalonia; -using Avalonia.Controls; using Avalonia.iOS; -using Avalonia.Media; namespace Ursa.Demo.iOS; diff --git a/demo/Ursa.Demo/Converters/IconNameConverter.cs b/demo/Ursa.Demo/Converters/IconNameConverter.cs index 4d1fe99..98c82c6 100644 --- a/demo/Ursa.Demo/Converters/IconNameConverter.cs +++ b/demo/Ursa.Demo/Converters/IconNameConverter.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using Avalonia; -using Avalonia.Controls.Shapes; using Avalonia.Data.Converters; using Avalonia.Media; using Avalonia.Metadata; @@ -25,7 +23,7 @@ public class IconNameConverter: IValueConverter return AvaloniaProperty.UnsetValue; } - public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) + public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs b/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs index 4451895..d9e2a08 100644 --- a/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs +++ b/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs @@ -1,7 +1,6 @@ using System; using System.Globalization; using Avalonia; -using Avalonia.Controls; using Avalonia.Data.Converters; using Avalonia.Media; @@ -9,7 +8,7 @@ namespace Ursa.Demo.Converters; public class IconNameToPathConverter: IValueConverter { - private string[] paths = new[] + private readonly string[] _paths = new[] { "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z", "M16 12L9 2L2 12H3.86L0 18H7V22H11V18H18L14.14 12H16M20.14 12H22L15 2L12.61 5.41L17.92 13H15.97L19.19 18H24L20.14 12M13 19H17V22H13V19Z", @@ -19,23 +18,23 @@ public class IconNameToPathConverter: IValueConverter "M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z", "M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12S17.5 2 12 2M12.5 13H11V7H12.5V11.3L16.2 9.2L17 10.5L12.5 13Z" }; - public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) + public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { if (value is int i) { - string s = paths[i % paths.Length]; + var s = _paths[i % _paths.Length]; return StreamGeometry.Parse(s); } else if (value is string s) { - int hash = s.GetHashCode(); - string path = paths[Math.Abs(hash) % paths.Length]; + var hash = s.GetHashCode(); + var path = _paths[Math.Abs(hash) % _paths.Length]; return StreamGeometry.Parse(path); } - return AvaloniaProperty.UnsetValue; + return AvaloniaProperty.UnsetValue; } - public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) + public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) { return AvaloniaProperty.UnsetValue; } diff --git a/demo/Ursa.Demo/Converters/TimelineIconConverter.cs b/demo/Ursa.Demo/Converters/TimelineIconConverter.cs index 04d46f4..8197a63 100644 --- a/demo/Ursa.Demo/Converters/TimelineIconConverter.cs +++ b/demo/Ursa.Demo/Converters/TimelineIconConverter.cs @@ -1,7 +1,6 @@ using System; using System.Globalization; using Avalonia; -using Avalonia.Data; using Avalonia.Data.Converters; using Avalonia.Media; using Ursa.Controls; @@ -10,7 +9,7 @@ namespace Ursa.Demo.Converters; public class TimelineIconConverter: IValueConverter { - public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) + public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { if (value is TimelineItemType t) { @@ -25,7 +24,7 @@ public class TimelineIconConverter: IValueConverter return AvaloniaProperty.UnsetValue; } - public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) + public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/demo/Ursa.Demo/DataTemplates/ToolBarItemTemplateSelector.cs b/demo/Ursa.Demo/DataTemplates/ToolBarItemTemplateSelector.cs index bfd9c76..fcbe6a4 100644 --- a/demo/Ursa.Demo/DataTemplates/ToolBarItemTemplateSelector.cs +++ b/demo/Ursa.Demo/DataTemplates/ToolBarItemTemplateSelector.cs @@ -14,11 +14,11 @@ public class ToolBarItemTemplateSelector: IDataTemplate public Control? Build(object? param) { if (param is null) return null; - if (param is ToolBarSeparatorViewModel sep) + if (param is ToolBarSeparatorViewModel) { return new ToolBarSeparator(); } - if (param is ToolBarButtonItemViewModel vm) + if (param is ToolBarButtonItemViewModel) { return new Button() { @@ -27,7 +27,7 @@ public class ToolBarItemTemplateSelector: IDataTemplate [!ToolBar.OverflowModeProperty] = new Binding(){Path = nameof(ToolBarItemViewModel.OverflowMode)}, }; } - if (param is ToolBarCheckBoxItemViweModel cb) + if (param is ToolBarCheckBoxItemViweModel) { return new CheckBox() { @@ -36,7 +36,7 @@ public class ToolBarItemTemplateSelector: IDataTemplate [!ToolBar.OverflowModeProperty] = new Binding(){Path = nameof(ToolBarItemViewModel.OverflowMode)}, }; } - if (param is ToolBarComboBoxItemViewModel combo) + if (param is ToolBarComboBoxItemViewModel) { return new ComboBox() { diff --git a/demo/Ursa.Demo/DataTemplates/ViewLocator.cs b/demo/Ursa.Demo/DataTemplates/ViewLocator.cs index fbbbece..15e3d99 100644 --- a/demo/Ursa.Demo/DataTemplates/ViewLocator.cs +++ b/demo/Ursa.Demo/DataTemplates/ViewLocator.cs @@ -1,7 +1,6 @@ using System; using Avalonia.Controls; using Avalonia.Controls.Templates; -using Ursa.Demo.Pages; namespace Ursa.Demo.Converters; @@ -10,16 +9,13 @@ public class ViewLocator: IDataTemplate public Control? Build(object? param) { if (param is null) return null; - var name = param.GetType().Name!.Replace("ViewModel", ""); + var name = param.GetType().Name.Replace("ViewModel", ""); var type = Type.GetType("Ursa.Demo.Pages."+name); if (type != null) { return (Control)Activator.CreateInstance(type)!; } - else - { - return new TextBlock { Text = "Not Found: " + name }; - } + return new TextBlock { Text = "Not Found: " + name }; } public bool Match(object? data) diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs index 783f47b..08724f8 100644 --- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs +++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Dialogs; diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs index 1e4be06..4110bb6 100644 --- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs +++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Dialogs; diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml.cs b/demo/Ursa.Demo/Pages/AvatarDemo.axaml.cs index 5bc2485..cffff7d 100644 --- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/BadgeDemo.axaml.cs b/demo/Ursa.Demo/Pages/BadgeDemo.axaml.cs index eec79bf..7caa06c 100644 --- a/demo/Ursa.Demo/Pages/BadgeDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/BadgeDemo.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs b/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs index 72a772d..cd7b94d 100644 --- a/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs @@ -1,5 +1,4 @@ using System.Collections.ObjectModel; -using Avalonia; using Avalonia.Controls; using Avalonia.Controls.Notifications; using Avalonia.Markup.Xaml; @@ -23,9 +22,9 @@ public partial class BannerDemo : UserControl public class BannerDemoViewModel : ViewModelBase { - private ObservableCollection _types; + private ObservableCollection? _types; - public ObservableCollection Types + public ObservableCollection? Types { get => _types; set => SetProperty(ref _types, value); diff --git a/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml.cs b/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml.cs index c119fc7..1f63393 100644 --- a/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs index 533130a..5b00129 100644 --- a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -10,6 +8,6 @@ public partial class ButtonGroupDemo : UserControl public ButtonGroupDemo() { InitializeComponent(); - this.DataContext = new ButtonGroupDemoViewModel(); + DataContext = new ButtonGroupDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/ClassInputDemo.axaml.cs b/demo/Ursa.Demo/Pages/ClassInputDemo.axaml.cs index 30e502a..851cb7b 100644 --- a/demo/Ursa.Demo/Pages/ClassInputDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ClassInputDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/ClockDemo.axaml.cs b/demo/Ursa.Demo/Pages/ClockDemo.axaml.cs index 058136a..3db30dd 100644 --- a/demo/Ursa.Demo/Pages/ClockDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ClockDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs index e38d30d..74214c7 100644 --- a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs @@ -1,7 +1,5 @@ using System.Diagnostics; -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; using Ursa.Controls; namespace Ursa.Demo.Pages; @@ -13,12 +11,12 @@ public partial class DatePickerDemo : UserControl InitializeComponent(); } - private void CalendarView_OnOnDateSelected(object? sender, CalendarDayButtonEventArgs e) + private void CalendarView_OnOnDateSelected(object? _, CalendarDayButtonEventArgs e) { Debug.WriteLine("Pressed: "+ e.Date?.ToLongDateString()); } - private void CalendarView_OnOnDatePreviewed(object? sender, CalendarDayButtonEventArgs e) + private void CalendarView_OnOnDatePreviewed(object? _, CalendarDayButtonEventArgs e) { Debug.WriteLine("Hovered: "+e.Date?.ToLongDateString()); } diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs b/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs index 2453f1a..ed838eb 100644 --- a/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml.cs index 68b6fbd..0476b6c 100644 --- a/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DisableContainerDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs index bdd3bd4..9f3018a 100644 --- a/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; diff --git a/demo/Ursa.Demo/Pages/DrawerDemo.axaml b/demo/Ursa.Demo/Pages/DrawerDemo.axaml index 2429a65..96b1eac 100644 --- a/demo/Ursa.Demo/Pages/DrawerDemo.axaml +++ b/demo/Ursa.Demo/Pages/DrawerDemo.axaml @@ -2,7 +2,6 @@ x:Class="Ursa.Demo.Pages.DrawerDemo" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:common="clr-namespace:Ursa.Common;assembly=Ursa" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:u="https://irihi.tech/ursa" diff --git a/demo/Ursa.Demo/Pages/DrawerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DrawerDemo.axaml.cs index 3aa8916..788fa0d 100644 --- a/demo/Ursa.Demo/Pages/DrawerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DrawerDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/EnumSelectorDemo.axaml.cs b/demo/Ursa.Demo/Pages/EnumSelectorDemo.axaml.cs index da6250a..a1bbd81 100644 --- a/demo/Ursa.Demo/Pages/EnumSelectorDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/EnumSelectorDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/FormDemo.axaml.cs b/demo/Ursa.Demo/Pages/FormDemo.axaml.cs index 64a5f0c..3881d9b 100644 --- a/demo/Ursa.Demo/Pages/FormDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/FormDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/IPv4BoxDemo.axaml.cs b/demo/Ursa.Demo/Pages/IPv4BoxDemo.axaml.cs index c3a050c..fc8b272 100644 --- a/demo/Ursa.Demo/Pages/IPv4BoxDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/IPv4BoxDemo.axaml.cs @@ -1,9 +1,4 @@ -using System; -using System.Net; -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using CommunityToolkit.Mvvm.ComponentModel; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/IconButtonDemo.axaml.cs b/demo/Ursa.Demo/Pages/IconButtonDemo.axaml.cs index 4b2931d..bb07fc8 100644 --- a/demo/Ursa.Demo/Pages/IconButtonDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/IconButtonDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs index 7aa908c..e558339 100644 --- a/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ImageViewerDemo.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml index ba2bbbf..c292152 100644 --- a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml +++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml @@ -2,7 +2,6 @@ x:Class="Ursa.Demo.Pages.IntroductionDemo" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="clr-namespace:Ursa.Demo.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:u="https://irihi.tech/ursa" diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs index ec1ee5c..2dab9c9 100644 --- a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/KeyGestureInputDemo.axaml.cs b/demo/Ursa.Demo/Pages/KeyGestureInputDemo.axaml.cs index f213756..c5fc35f 100644 --- a/demo/Ursa.Demo/Pages/KeyGestureInputDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/KeyGestureInputDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; @@ -10,9 +8,4 @@ public partial class KeyGestureInputDemo : UserControl { InitializeComponent(); } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs b/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs index cfbc0e8..65a17f2 100644 --- a/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; diff --git a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs index 0b5cf40..cfdc4c9 100644 --- a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml.cs b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml.cs index 2a51be5..9c67a7f 100644 --- a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs b/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs index eac27af..d1bae7d 100644 --- a/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs @@ -1,9 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.Shapes; -using Avalonia.Input; -using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -13,15 +8,6 @@ public partial class NavMenuDemo : UserControl public NavMenuDemo() { InitializeComponent(); - this.DataContext = new NavMenuDemoViewModel(); - } - - private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e) - { - if (sender is Rectangle c) - { - c.ApplyStyling(); - var ancestors = c.GetLogicalAncestors(); - } + DataContext = new NavMenuDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs b/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs index b82a6ae..8e3a09e 100644 --- a/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/NumberDisplayerDemo.axaml.cs b/demo/Ursa.Demo/Pages/NumberDisplayerDemo.axaml.cs index 35df3ef..ea47763 100644 --- a/demo/Ursa.Demo/Pages/NumberDisplayerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/NumberDisplayerDemo.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Ursa.Demo.Pages; diff --git a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml index 75baa53..610c37a 100644 --- a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml +++ b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml @@ -55,7 +55,7 @@ Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left"> - +