diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/ClickGestureGalleryPage.cs b/src/Controls/samples/Controls.Sample/Pages/Core/ClickGestureGalleryPage.cs similarity index 96% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/ClickGestureGalleryPage.cs rename to src/Controls/samples/Controls.Sample/Pages/Core/ClickGestureGalleryPage.cs index cea04d434bf9..a1e798c70f24 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/ClickGestureGalleryPage.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Core/ClickGestureGalleryPage.cs @@ -1,9 +1,8 @@ -using System; -using Maui.Controls.Sample.Pages.Base; +using Maui.Controls.Sample.Pages.Base; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; -namespace Maui.Controls.Sample.Pages.Gestures +namespace Maui.Controls.Sample.Pages { public class ClickGestureGalleryPage : BasePage { diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml similarity index 92% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml rename to src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml index b79eef6823e6..2344cf751ac4 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml +++ b/src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml @@ -2,8 +2,8 @@ + x:Class="Maui.Controls.Sample.Pages.DragAndDropBetweenLayouts" + xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"> diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml.cs similarity index 95% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml.cs rename to src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml.cs index 54e697a7da60..694028263efd 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/DragAndDropBetweenLayouts.xaml.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Core/DragAndDropBetweenLayouts.xaml.cs @@ -1,21 +1,18 @@ using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Maui.Controls.Sample.Pages.Base; using Microsoft.Maui.Controls; -namespace Maui.Controls.Sample.Pages.Gestures +namespace Maui.Controls.Sample.Pages { public partial class DragAndDropBetweenLayouts { public ObservableCollection AllColors { get; } public ObservableCollection RainbowColors { get; } + public DragAndDropBetweenLayouts() { InitializeComponent(); + Console.WriteLine("Some really long text Some really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long textSome really long text"); AllColors = new ObservableCollection(); RainbowColors = new ObservableCollection(); diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/PanGestureGalleryPage.cs b/src/Controls/samples/Controls.Sample/Pages/Core/PanGestureGalleryPage.cs similarity index 96% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/PanGestureGalleryPage.cs rename to src/Controls/samples/Controls.Sample/Pages/Core/PanGestureGalleryPage.cs index c5de7111d530..1ba80a2d61f5 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/PanGestureGalleryPage.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Core/PanGestureGalleryPage.cs @@ -1,21 +1,20 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Maui.Controls.Sample.Pages.Base; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Internals; + using Microsoft.Maui.Graphics; -namespace Maui.Controls.Sample.Pages.Gestures +namespace Maui.Controls.Sample.Pages { public class PanGestureGalleryPage : BasePage { public class PanCompleteArgs : EventArgs { public PanCompleteArgs(string message) { Message = message; } + public string Message { get; private set; diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/PinchGestureTestPage.cs b/src/Controls/samples/Controls.Sample/Pages/Core/PinchGestureTestPage.cs similarity index 96% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/PinchGestureTestPage.cs rename to src/Controls/samples/Controls.Sample/Pages/Core/PinchGestureTestPage.cs index c4d91648f973..5c7470193f26 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/PinchGestureTestPage.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Core/PinchGestureTestPage.cs @@ -1,13 +1,11 @@ using System; -using System.Diagnostics; using System.Linq; using Maui.Controls.Sample.Pages.Base; using Microsoft.Maui; using Microsoft.Maui.Controls; -using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Graphics; -namespace Maui.Controls.Sample.Pages.Gestures +namespace Maui.Controls.Sample.Pages { public class PinchToZoomContainer : VerticalStackLayout { @@ -16,7 +14,6 @@ public PinchToZoomContainer() } - public View Content { get => Children.OfType().LastOrDefault(); diff --git a/src/Controls/samples/Controls.Sample/Pages/Gestures/SwipeGestureGalleryPage.cs b/src/Controls/samples/Controls.Sample/Pages/Core/SwipeGestureGalleryPage.cs similarity index 98% rename from src/Controls/samples/Controls.Sample/Pages/Gestures/SwipeGestureGalleryPage.cs rename to src/Controls/samples/Controls.Sample/Pages/Core/SwipeGestureGalleryPage.cs index 38587acf3da5..85ab283f1e6e 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Gestures/SwipeGestureGalleryPage.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Core/SwipeGestureGalleryPage.cs @@ -5,7 +5,7 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; -namespace Maui.Controls.Sample.Pages.Gestures +namespace Maui.Controls.Sample.Pages { public class SwipeGestureGalleryPage : BasePage { diff --git a/src/Controls/samples/Controls.Sample/Pages/GesturesPage.xaml b/src/Controls/samples/Controls.Sample/Pages/GesturesPage.xaml index e6d4927213bc..3137c73a936d 100644 --- a/src/Controls/samples/Controls.Sample/Pages/GesturesPage.xaml +++ b/src/Controls/samples/Controls.Sample/Pages/GesturesPage.xaml @@ -44,13 +44,13 @@ - - - - @@ -52,7 +52,7 @@ + Text="Settings" /> - + @@ -106,11 +106,11 @@ RowDefinitions="Auto, *"> @@ -120,11 +120,8 @@ \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold-Italic.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold-Italic.ttf new file mode 100644 index 000000000000..d134de856896 Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold-Italic.ttf differ diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold.ttf new file mode 100644 index 000000000000..5723e8b8b8aa Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Bold.ttf differ diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Italic.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Italic.ttf new file mode 100644 index 000000000000..07fdf851f7d8 Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI-Italic.ttf differ diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI.ttf new file mode 100644 index 000000000000..46b3b99387e3 Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/SegoeUI.ttf differ diff --git a/src/Controls/samples/Controls.Sample/Startup.cs b/src/Controls/samples/Controls.Sample/Startup.cs index e446eee1e071..19de29f47875 100644 --- a/src/Controls/samples/Controls.Sample/Startup.cs +++ b/src/Controls/samples/Controls.Sample/Startup.cs @@ -121,6 +121,10 @@ public void Configure(IAppHostBuilder appBuilder) fonts.AddFont("LobsterTwo-Italic.ttf", "Lobster Two Italic"); fonts.AddFont("LobsterTwo-BoldItalic.ttf", "Lobster Two BoldItalic"); fonts.AddFont("ionicons.ttf", "Ionicons"); + fonts.AddFont("SegoeUI.ttf", "Segoe UI"); + fonts.AddFont("SegoeUI-Bold.ttf", "Segoe UI Bold"); + fonts.AddFont("SegoeUI-Italic.ttf", "Segoe UI Italic"); + fonts.AddFont("SegoeUI-Bold-Italic.ttf", "Segoe UI Bold Italic"); }) .ConfigureEssentials(essentials => { diff --git a/src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs index 196484f3b29c..69c00e52704e 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs @@ -15,6 +15,9 @@ protected override IEnumerable CreateItems() => new[] new SectionModel(typeof(ClipPage), "Clip", "Defines the outline of the contents of an element."), + new SectionModel(typeof(GesturesPage), "Gestures", + "Use tap, pinch, pan, swipe, and drag and drop gestures on View instances."), + new SectionModel(typeof(SemanticsPage), "Semantics", ".NET MAUI allows accessibility values to be set on user interface elements by using Semantics values."), diff --git a/src/Controls/samples/Controls.Sample/ViewModels/GesturesViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/GesturesViewModel.cs index 3d9cbeda9397..f1fcff5a08a5 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/GesturesViewModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/GesturesViewModel.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Maui.Controls.Sample.Models; using Maui.Controls.Sample.Pages; -using Maui.Controls.Sample.Pages.Gestures; using Maui.Controls.Sample.ViewModels.Base; namespace Maui.Controls.Sample.ViewModels @@ -23,7 +22,6 @@ protected override IEnumerable CreateItems() => new[] new SectionModel(typeof(ClickGestureGalleryPage), "Click Gesture", "Click Gesture."), #endif - }; } } diff --git a/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs index c401617991fe..7082843f047f 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs @@ -40,10 +40,7 @@ protected override IEnumerable CreateItems() => new[] "User interface concepts like Animations, Colors, Fonts and more."), new SectionModel(typeof(OthersPage), "Others Concepts", - "Other options like Graphics."), - - new SectionModel(typeof(GesturesPage), "Gestures", - "Gestures") + "Other options like Graphics.") }; } } \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample/XamlApp.xaml b/src/Controls/samples/Controls.Sample/XamlApp.xaml index aba7732d7bd8..f24ab686f873 100644 --- a/src/Controls/samples/Controls.Sample/XamlApp.xaml +++ b/src/Controls/samples/Controls.Sample/XamlApp.xaml @@ -37,28 +37,35 @@