diff --git a/README.md b/README.md index b52e19892d..788bf2652c 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ For additional Windows samples, see [Windows on GitHub](http://microsoft.github. Title bar - UI basics (XAML) + UI basics (XAML) User interaction mode WebView control (HTML) diff --git a/Samples/XamlUIBasics/README.md b/Samples/XamlUIBasics/README.md index 782cb6b978..a40c479406 100644 --- a/Samples/XamlUIBasics/README.md +++ b/Samples/XamlUIBasics/README.md @@ -3,66 +3,6 @@ samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=619992 ---> -# XAML Controls Gallery (aka XamlUiBasics) +# XAML Controls Gallery -Shows all of the XAML controls in an interactive format. This app is the interactive companion to the [Windows Style Guide](https://getfluentdesign.com/). - -> **Note:** This sample is part of a large collection of UWP feature samples. -> If you are unfamiliar with Git and GitHub, you can download the entire collection as a -> [ZIP file](https://github.com/Microsoft/Windows-universal-samples/archive/master.zip), but be -> sure to unzip everything to access shared dependencies. For more info on working with the ZIP file, -> the samples collection, and GitHub, see [Get the UWP samples from GitHub](https://aka.ms/ovu2uq). -> For more samples, see the [Samples portal](https://aka.ms/winsamples) on the Windows Dev Center. - -Specifically, this sample shows how to: - -- **Specify XAML controls in markup:** Each control page shows the markup used to create each example -- **Basic layout:** This sample will show all of the possible layout options for your app and allow you to interact with the panels to show how to achieve any layout you are looking for. -- **Adaptive UI:** In addition to showing how each control responds to different form factors, the app itself is responsive and shows various methods for achieving adaptive UI. - -**Note** The Windows universal samples require Visual Studio 2017 to build and Windows 10 to execute. - -To obtain information about Windows 10 development, go to the [Windows Dev Center](http://go.microsoft.com/fwlink/?LinkID=532421) - -To obtain information about Microsoft Visual Studio and the tools for developing Windows apps, go to [Visual Studio](http://go.microsoft.com/fwlink/?LinkID=532422) - -## Related topics - -[XAML app UI, start to finish](http://msdn.microsoft.com/library/windows/apps/dn263191.aspx) - -Each control page in the application has links to the relevant MSDN documentation for that control. - -[Install a prebuilt version of this sample](https://www.microsoft.com/store/productId/9MSVH128X2ZT). - -## Related samples - -[RSS reader sample](https://github.com/Microsoft/Windows-appsample-rssreader) -[Lunch Scheduler app sample](https://github.com/Microsoft/Windows-appsample-lunch-scheduler) -[Customers Orders Database sample](https://github.com/Microsoft/Windows-appsample-customers-orders-database) - -## System requirements - -**Client:** Windows 10 - -**Server:** Windows Server 2016 Technical Preview - -**Phone:** Windows 10 - -## Build the sample - -1. If you download the samples ZIP, be sure to unzip the entire archive, not just the folder with the sample you want to build. -2. Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**. -3. Starting in the folder where you unzipped the samples, go to the Samples subfolder, then the subfolder for this specific sample, then the subfolder for your preferred language (C++, C#, or JavaScript). Double-click the Visual Studio Solution (.sln) file. -4. Press Ctrl+Shift+B, or select **Build** \> **Build Solution**. - -## Run the sample - -The next steps depend on whether you just want to deploy the sample or you want to both deploy and run it. - -### Deploying the sample - -- Select Build > Deploy Solution. - -### Deploying and running the sample - -- To debug the sample and then run it, press F5 or select Debug > Start Debugging. To run the sample without debugging, press Ctrl+F5 or selectDebug > Start Without Debugging. +The XAML Controls Gallery has [moved to its own repo](https://github.com/Microsoft/Xaml-Controls-Gallery). diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml deleted file mode 100644 index 71cda959d0..0000000000 --- a/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml.cs deleted file mode 100644 index 32ecc37108..0000000000 --- a/Samples/XamlUIBasics/cs/AppUIBasics/AllControlsPage.xaml.cs +++ /dev/null @@ -1,43 +0,0 @@ -//********************************************************* -// -// Copyright (c) Microsoft. All rights reserved. -// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY -// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR -// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. -// -//********************************************************* -using AppUIBasics.Data; -using System.Linq; -using Windows.UI; -using Windows.UI.ViewManagement; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Navigation; - -namespace AppUIBasics -{ - /// - /// A page that displays a grouped collection of items. - /// - public sealed partial class AllControlsPage : ItemsPageBase - { - public AllControlsPage() - { - this.InitializeComponent(); - } - - protected override void OnNavigatedTo(NavigationEventArgs e) - { - var menuItem = NavigationRootPage.Current.NavigationView.MenuItems.Cast().First(); - menuItem.IsSelected = true; - NavigationRootPage.Current.NavigationView.Header = menuItem.Content; - Items = ControlInfoDataSource.Instance.Groups.SelectMany(g => g.Items).OrderBy(i => i.Title).ToList(); - } - - protected override bool GetIsNarrowLayoutState() - { - return LayoutVisualStates.CurrentState == NarrowLayout; - } - } -} \ No newline at end of file diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/App.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/App.xaml deleted file mode 100644 index da8c4a29d0..0000000000 --- a/Samples/XamlUIBasics/cs/AppUIBasics/App.xaml +++ /dev/null @@ -1,473 +0,0 @@ - - - - - - - - - - - - - - ms-appx:///Assets/sun-100-Black.png - 0 - - - - - ms-appx:///Assets/Sun.32.scale-100-White.png - 0 - - - - - 2 - - - - - - - - - - - - - - - - - - - - - 641 - - All controls - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - -