diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml index a6a986d1322c..754b2dd6bc43 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml @@ -11,10 +11,10 @@ - + - - + + diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml.cs index 2043899e54a5..6eb610a309ad 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SymbolIconTests/SymbolIcon_Generic.xaml.cs @@ -15,23 +15,23 @@ public SymbolIcon_Generic() this.InitializeComponent(); } - public List Symbols { get; } = + public List Symbols { get; } = Enum.GetValues(typeof(Symbol)) .Cast() - .Select(symbol => new SymbolItem(symbol)) - .ToList(); + .Select(symbol => new SymbolListItem(symbol)) + .ToList(); + } - public class SymbolItem + public class SymbolListItem + { + public SymbolListItem(Symbol symbol) { - public SymbolItem(Symbol symbol) - { - Symbol = symbol; - Name = Enum.GetName(typeof(Symbol), symbol); - } + Symbol = symbol; + Name = Enum.GetName(typeof(Symbol), symbol); + } - public Symbol Symbol { get; } + public Symbol Symbol { get; } - public string Name { get; } - } - } + public string Name { get; } + } } diff --git a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/Symbol.cs b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/Symbol.cs index d834b807cce3..67c0c3b976bd 100644 --- a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/Symbol.cs +++ b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/Symbol.cs @@ -2,10 +2,10 @@ #pragma warning disable 114 // new keyword hiding namespace Windows.UI.Xaml.Controls { - #if false || false || false || false || false || false || false - #if false || false || false || false || false || false || false +#if false || false || false || false || false || false || false +#if false || false || false || false || false || false || false [global::Uno.NotImplemented] - #endif +#endif public enum Symbol { // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.Previous @@ -201,18 +201,10 @@ public enum Symbol // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.FourBars // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.Scan // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.Preview - #if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__ - GlobalNavigationButton, - #endif - #if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__ - Share, - #endif - #if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__ - Print, - #endif - #if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__ - XboxOneConsole, - #endif + // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.GlobalNavigationButton + // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.Share + // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.Print + // Skipping already declared field Windows.UI.Xaml.Controls.Symbol.XboxOneConsole } - #endif +#endif } diff --git a/src/Uno.UI/UI/Xaml/Controls/Symbol.cs b/src/Uno.UI/UI/Xaml/Controls/Symbol.cs index d1c0ea5ee313..3e94857631d4 100644 --- a/src/Uno.UI/UI/Xaml/Controls/Symbol.cs +++ b/src/Uno.UI/UI/Xaml/Controls/Symbol.cs @@ -1,7 +1,4 @@ -using Windows.Foundation; -using Windows.Foundation.Metadata; - -namespace Windows.UI.Xaml.Controls +namespace Windows.UI.Xaml.Controls { public enum Symbol { @@ -197,6 +194,10 @@ public enum Symbol ThreeBars = 57832, FourBars = 57833, Scan = 58004, - Preview = 58005 + Preview = 58005, + GlobalNavigationButton = 59136, + Share = 59181, + Print = 59209, + XboxOneConsole = 59792 } -} \ No newline at end of file +} diff --git a/src/Uno.UI/UI/Xaml/Controls/SymbolIcon/SymbolIcon.cs b/src/Uno.UI/UI/Xaml/Controls/SymbolIcon/SymbolIcon.cs index 694eb432c07d..0769538d7a0d 100644 --- a/src/Uno.UI/UI/Xaml/Controls/SymbolIcon/SymbolIcon.cs +++ b/src/Uno.UI/UI/Xaml/Controls/SymbolIcon/SymbolIcon.cs @@ -30,7 +30,7 @@ public Symbol Symbol } public static DependencyProperty SymbolProperty { get; } = - DependencyProperty.Register("Symbol", typeof(Symbol), typeof(SymbolIcon), new FrameworkPropertyMetadata(Symbol.Emoji, OnSymbolChanged)); + DependencyProperty.Register(nameof(Symbol), typeof(Symbol), typeof(SymbolIcon), new FrameworkPropertyMetadata(Symbol.Emoji, OnSymbolChanged)); private static void OnSymbolChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args) {