diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj index fbf81b0de37..be59d8d8b9c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj @@ -79,34 +79,18 @@ - - - - - - - - - - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs index 092409a1a4a..15da20fa9e5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs @@ -95,77 +95,5 @@ internal static string CategoryDropShadow { return ResourceManager.GetString("CategoryDropShadow", resourceCulture); } } - - /// - /// Looks up a localized string similar to Interactions. - /// - internal static string CategoryInteractions { - get { - return ResourceManager.GetString("CategoryInteractions", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style - Code. - /// - internal static string CategoryMarkdownCodeStyle { - get { - return ResourceManager.GetString("CategoryMarkdownCodeStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style - Header {0}. - /// - internal static string CategoryMarkdownHeaderStyle { - get { - return ResourceManager.GetString("CategoryMarkdownHeaderStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style - List. - /// - internal static string CategoryMarkdownListStyle { - get { - return ResourceManager.GetString("CategoryMarkdownListStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style - Quote. - /// - internal static string CategoryMarkdownQuoteStyle { - get { - return ResourceManager.GetString("CategoryMarkdownQuoteStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style. - /// - internal static string CategoryMarkdownStyle { - get { - return ResourceManager.GetString("CategoryMarkdownStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Markdown Style - Table. - /// - internal static string CategoryMarkdownTableStyle { - get { - return ResourceManager.GetString("CategoryMarkdownTableStyle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Text. - /// - internal static string CategoryText { - get { - return ResourceManager.GetString("CategoryText", resourceCulture); - } - } } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx index 56bca35d53f..aeb265b2d63 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx @@ -129,28 +129,4 @@ Drop Shadow - - Interactions - - - Markdown Style - Code - - - Markdown Style - Header {0} - - - Markdown Style - List - - - Markdown Style - Quote - - - Markdown Style - - - Markdown Style - Table - - - Text - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs index 4dbe5a80025..3f8f8a3a5ac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs @@ -22,7 +22,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls /// Menu Item is the items main container for Class Menu control /// [Obsolete("This control will be removed in a future major release. Please use the MenuBar control from the WinUI Library instead.")] - public class MenuItem : HeaderedItemsControl + public class MenuItem : ItemsControl { private const string FlyoutButtonName = "FlyoutButton"; private const char UnderlineCharacter = '^'; @@ -49,6 +49,39 @@ private object InternalHeader } } + /// + /// Gets or sets the header of each control. + /// + public object Header + { + get { return (object)GetValue(HeaderProperty); } + set { SetValue(HeaderProperty, value); } + } + + /// + /// Identifies the dependency property. + /// + public static readonly DependencyProperty HeaderProperty = + DependencyProperty.Register(nameof(Header), typeof(object), typeof(MenuItem), new PropertyMetadata(null, OnHeaderChanged)); + + /// + /// Gets or sets the template used to display the content of the control's header. + /// + public DataTemplate HeaderTemplate + { + get { return (DataTemplate)GetValue(HeaderTemplateProperty); } + set { SetValue(HeaderTemplateProperty, value); } + } + + /// + /// Identifies the dependency property. + /// + public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register( + nameof(HeaderTemplate), + typeof(DataTemplate), + typeof(MenuItem), + new PropertyMetadata(null)); + /// /// Gets a value indicating whether the menu is opened or not /// @@ -497,40 +530,40 @@ internal void Underline() InternalHeader = text; } - /// - protected override void OnHeaderChanged(object oldValue, object newValue) + private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { - base.OnHeaderChanged(oldValue, newValue); - - if (_isInternalHeaderUpdate) + if (d is MenuItem menuitem) { - return; - } + if (menuitem._isInternalHeaderUpdate) + { + return; + } - _originalHeader = null; + menuitem._originalHeader = null; - var headerString = newValue as string; + var headerString = e.NewValue as string; - if (string.IsNullOrEmpty(headerString)) - { - return; - } + if (string.IsNullOrEmpty(headerString)) + { + return; + } - var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter); + var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter); - if (underlineCharacterIndex == -1) - { - return; - } + if (underlineCharacterIndex == -1) + { + return; + } - if (underlineCharacterIndex == headerString.Length - 1) - { - InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); - return; - } + if (underlineCharacterIndex == headerString.Length - 1) + { + menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + return; + } - _originalHeader = headerString; - InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + menuitem._originalHeader = headerString; + menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + } } internal void RemoveUnderline() diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml new file mode 100644 index 00000000000..aff05ea89b6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml @@ -0,0 +1,18 @@ + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj index 4537d59aaf6..c246a32ec0c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj @@ -7,21 +7,12 @@ This library provides XAML templated controls. It is part of the Windows Community Toolkit. Controls: - - BladeView: Provides a horizontal collection of blades for master-detail scenarios. - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source. - - Carousel: Presents items in a carousel control. - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version. - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup. - - Expander: Expander allows user to show/hide content based on a boolean state. - - GridSplitter: A the control that redistributes space between columns or rows of a Grid control. - - HeaderedContentControl: Provides a header to content. - - HeaderedItemsControl: Provides a header to items. - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache. - InAppNotification: Show local notifications in your application. - - LayoutTransformControl: Support for transformations as if applied by LayoutTransform. - Loading: Helps to show content with animation to the user while the app is doing some calculation. - - ListDetailsView: Implements the List/Details design pattern. - - OrbitView: Positions items in a circle around a center element and supports orbits and anchors. - RadialGauge: Displays a value within a range, using a needle on a circular face. - RadialProgressBar: Displays progress as a circle getting filled. - RangeSelector: "Double slider" control for range values. @@ -31,7 +22,7 @@ - TileControl: A ContentControl that show an image repeated many times. - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags. - UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas List Details ListDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox + UWP Toolkit Windows Controls XAML Range Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox false 8.0 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings index fefa011eb69..781434d32a7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings @@ -1,7 +1,5 @@  - True True - True True True True diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw index bcad38e26ee..484e3eb498b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw @@ -193,18 +193,6 @@ Warning Label for TextToolbar Control Warning message. - - Collapse Blade - Narrator Resource for BladeView collapsed status - - - Expand Blade - Narrator Resource for BladeView expanded status - - - GridSplitter - Narrator Resource for GridSplitter control - Dismiss The automation name for the dismiss button of the InAppNotification control. @@ -221,4 +209,4 @@ Select All Label for TokenizingTextBox MenuFlyout 'Select All' option. - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml index d6c4cc4e660..9f6079cea14 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml @@ -1,24 +1,15 @@  - - - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml index 5a84cf2dbac..69e15c84e1c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml @@ -1,27 +1,14 @@ - - - - - - - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs new file mode 100644 index 00000000000..8236858858c --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs @@ -0,0 +1,28 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + internal static partial class ControlTypes + { + // HACK: Don't forget to update, if the namespace changes. + public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls"; + } + + /// + /// Names for ToolboxCategoryAttribute. + /// + internal static class ToolboxCategoryPaths + { + /// + /// Basic Controls category. + /// + public const string Toolkit = "Windows Community Toolkit"; + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs new file mode 100644 index 00000000000..024529d9fe9 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs @@ -0,0 +1,253 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Reflection; +using System.Xml.Linq; + +using Microsoft.Toolkit.Uwp.Design.Types; + +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; + +namespace Microsoft.Toolkit.Uwp.Design.Common +{ + public abstract class MetadataRegistrationBase : IProvideAttributeTable + { + private AttributeTable masterMetadataTable; + + internal MetadataRegistrationBase() { } + + /// + /// Build design time metadata attribute table. + /// + /// Custom attribute table. + protected virtual AttributeTable BuildAttributeTable() + { + var builder = new AttributeTableBuilder(); + + AddDescriptions(builder); + AddAttributes(builder); + AddTables(builder, this); + + masterMetadataTable = builder.CreateTable(); + return masterMetadataTable; + } + + #region IProvideAttributeTable Members + + /// + /// Gets the AttributeTable for design time metadata. + /// + public AttributeTable AttributeTable => BuildAttributeTable(); + + #endregion + + /// + /// Find all AttributeTableBuilder subclasses in the assembly + /// and add their attributes to the assembly attribute table. + /// + /// The assembly attribute table builder. + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")] + private void AddTables(AttributeTableBuilder builder, object parent) + { + Debug.Assert(builder != null, "AddTables is called with null parameter!"); + + Assembly asm = parent.GetType().Assembly; + foreach (Type t in asm.GetTypes()) + { + if (t.IsSubclassOf(typeof(AttributeTableBuilder))) + { + try + { + var atb = (AttributeTableBuilder)Activator.CreateInstance(t); + builder.AddTable(atb.CreateTable()); + } + catch (Exception) + { + //error loading design assembly + } + } + } + } + + /// + /// Gets or sets the case sensitive resource name of the embedded XML file. + /// + protected string XmlResourceName { get; set; } + + /// + /// Gets or sets the FullName of the corresponding run time assembly. + /// + protected string AssemblyFullName { get; set; } + + /// + /// Create description attribute from run time assembly XML file. + /// + /// The assembly attribute table builder. + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")] + private void AddDescriptions(AttributeTableBuilder builder) + { + Debug.Assert(builder != null, "AddDescriptions is called with null parameter!"); + + if (string.IsNullOrEmpty(XmlResourceName) || string.IsNullOrEmpty(AssemblyFullName)) return; + + XDocument xDoc; + try + { + xDoc = XDocument.Load(Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)); + } + catch + { + return; + } + + if (xDoc == null) return; + + foreach (XElement member in xDoc.Descendants("member")) + { + try + { + string name = (string)member.Attribute("name"); + + if (name == null) continue; + + bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase); + bool isProperty = name.StartsWith("P:", StringComparison.OrdinalIgnoreCase); + + if (isType || isProperty) + { + int lastDot = name.Length; + string typeName; + + if (isType) + { + typeName = name.Substring(2); // skip leading "T:" + } + else + { + lastDot = name.LastIndexOf('.'); + typeName = name.Substring(2, lastDot - 2); + } + + var type = Type.GetType(typeName + ", " + AssemblyFullName); + + if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject)) + { + string desc = ParseDescription(member); + + if (desc == null) continue; + + desc = string.Join(" ", desc.Trim().Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); + + if (isType) + { + if (IsBrowsable(type)) + { + builder.AddCustomAttributes(typeName, new DescriptionAttribute(desc)); + } + else //Hide from intellisense + { + builder.AddCustomAttributes(typeName, + new BrowsableAttribute(false), + new ToolboxBrowsableAttribute(false), + new ToolboxItemAttribute(false)); + } + } + else + { + var propertyName = name.Substring(lastDot + 1); + PropertyInfo pi = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); + if (pi != null) + { + if (IsBrowsable(type)) + { + builder.AddCustomAttributes(typeName, propertyName, new DescriptionAttribute(desc)); + } + else //Hide from intellisense + { + builder.AddCustomAttributes(typeName, new BrowsableAttribute(false)); + } + } + } + } + } + } + catch + { + } + } + } + + private static bool IsBrowsable(MemberInfo typeOrMember) + { + EditorBrowsableAttribute attribute; + try + { + attribute = typeOrMember.GetCustomAttribute(false); + } + catch + { + return true; // If there is no [EditorBrowsable] attribute present, we'll show it by default. + } + return attribute.State != EditorBrowsableState.Never; + } + + /// + /// Create description string from XML doc summary tag. + /// + /// A single node of the XML doc. + /// Description string. + private static string ParseDescription(XElement member) + { + string desc = null; + XElement memberDesc = member.Descendants("summary").FirstOrDefault(); + + if (memberDesc != null) + { + IEnumerable nodes = memberDesc.DescendantNodes(); + + if (nodes != null) + { + foreach (XNode node in nodes) + { + if (node.NodeType == System.Xml.XmlNodeType.Text) + { + desc += node.ToString(); + } + else + { + string s = node.ToString(); + int i = s.LastIndexOf('.'); + int j = s.LastIndexOf('"'); + + if ((i != -1 || j != -1) && j - i - 1 > 0) + { + try + { + desc += s.Substring(i + 1, j - i - 1); + } + catch { } + } + } + } + } + } + return desc; + } + + /// + /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass. + /// + /// The assembly attribute table builder. + protected virtual void AddAttributes(AttributeTableBuilder builder) + { + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs new file mode 100644 index 00000000000..57ecf3ec226 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs @@ -0,0 +1,41 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; + +namespace Microsoft.Toolkit.Uwp.Design.Types +{ + internal class PlatformTypes + { + public static readonly Type DependencyObject = typeof(DependencyObject); + public static readonly Type UIElement = typeof(UIElement); + public static readonly Type FrameworkElement = typeof(FrameworkElement); + public static readonly Type Control = typeof(Control); + } + + internal class XamlTypes + { + public static class FrameworkElement + { + public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement"); + public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin"); + public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment"); + public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment"); + public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height"); + public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width"); + } + + public static class Control + { + public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); + public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background"); + public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush"); + public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness"); + } + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs new file mode 100644 index 00000000000..2b755e8893f --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs @@ -0,0 +1,37 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Reflection; +using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design; + +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; + +[assembly: ProvideMetadata(typeof(MetadataRegistration))] + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + public class MetadataRegistration : MetadataRegistrationBase + { + public MetadataRegistration() : base() + { + // Note: + // The default constructor sets value of 'AssemblyFullName' and + // 'XmlResourceName' used by 'MetadataRegistrationBase.AddDescriptions()'. + // The convention here is that the in '.DesignTools.csproj' + // (or Default namespace in Project -> Properties -> Application tab) + // must be the same as runtime assembly's main namespace plus ".Design". + Type thisType = this.GetType(); + AssemblyName designLib = thisType.Assembly.GetName(); + + string annexString = ".DesignTools"; + int annexStart = designLib.Name.LastIndexOf(annexString); + string controlLibName = designLib.Name.Remove(annexStart, annexString.Length); + + AssemblyFullName = designLib.FullName; + XmlResourceName = $"{thisType.Namespace}{controlLibName}.xml"; + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj new file mode 100644 index 00000000000..b3dbfced410 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj @@ -0,0 +1,122 @@ + + + + + Debug + x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Release\uap10.0.17763\Design\ + pdbonly + x86 + true + TRACE + + + $(NoWarn);0618 + $(AssetTargetFallback);uap10.0.17763 + + + + + + + + False + False + + + False + False + + + + + + + + + + False + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd + + + + + + + + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + WindowsRuntime + False + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + WindowsRuntime + False + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + True + True + Resources.resx + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + Microsoft.Toolkit.Uwp.UI.Controls.Layout.xml + False + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..bfa162fde30 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs @@ -0,0 +1,32 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")] +[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Windows Community Toolkit")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US English +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs new file mode 100644 index 00000000000..a17591769f6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs @@ -0,0 +1,90 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Appearance. + /// + internal static string CategoryAppearance { + get { + return ResourceManager.GetString("CategoryAppearance", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Brush. + /// + internal static string CategoryBrush { + get { + return ResourceManager.GetString("CategoryBrush", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Common. + /// + internal static string CategoryCommon { + get { + return ResourceManager.GetString("CategoryCommon", resourceCulture); + } + } + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx new file mode 100644 index 00000000000..8a8f1b3f3ba --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Appearance + + + Brush + + + Common + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs similarity index 96% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs index b6683199794..9ea1d37f811 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs @@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args) { Width = _normalModeWidth; VisualStateManager.GoToState(this, "Expanded", true); - var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); + var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); @@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args) { Width = double.NaN; VisualStateManager.GoToState(this, "Collapsed", true); - var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); + var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs index edc0bab90c1..6b62580b8bd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs @@ -168,7 +168,7 @@ public GridSplitter() { DefaultStyleKey = typeof(GridSplitter); Loaded += GridSplitter_Loaded; - string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); + string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources"); AutomationProperties.SetName(this, automationName); } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index dd10bade86a..43b411b41a7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -2,23 +2,40 @@ uap10.0.17763 - 10.0.19041.0 Windows Community Toolkit Layout This library provides XAML layout controls. It is part of the Windows Community Toolkit. + + Controls: + - BladeView: Provides a horizontal collection of blades for master-detail scenarios. + - Carousel: Presents items in a carousel control. + - Expander: Expander allows user to show/hide content based on a boolean state. + - GridSplitter: A the control that redistributes space between columns or rows of a Grid control. + - HeaderedContentControl: Provides a header to content. + - HeaderedItemsControl: Provides a header to items. + - LayoutTransformControl: Support for transformations as if applied by LayoutTransform. + - ListDetailsView: Implements the List/Details design pattern. + - OrbitView: Positions items in a circle around a center element and supports orbits and anchors. + BladeView Blade Carousel Expander GridSplitter HeaderedContent List Details ListDetails Orbit Microsoft.Toolkit.Uwp.UI.Controls + false + 8.0 - + - + + + - + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings index 65848b5a192..c3f3d0a590b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings @@ -1,3 +1,4 @@  - + True + True \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs index 64a4e43ebc0..c24479258df 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs @@ -8,5 +8,4 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: InternalsVisibleTo("UnitTests")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw new file mode 100644 index 00000000000..604178d003e --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Collapse Blade + Narrator Resource for BladeView collapsed status + + + Expand Blade + Narrator Resource for BladeView expanded status + + + GridSplitter + Narrator Resource for GridSplitter control + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml new file mode 100644 index 00000000000..d6c7b6cd203 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml index 8d2ad7fe8bf..f8ae329c03d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml @@ -1,6 +1,19 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj index aad78b95e6b..bc7372a702b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj @@ -24,6 +24,10 @@ + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml similarity index 68% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml index 342912dbe1c..9d262a0cde6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml @@ -1,5 +1,5 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml index d628d8c1bc0..2ad0f30edd2 100644 --- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - -