Skip to content

Split Markdown.* from Controls package. #3437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
14 commits merged into from
Sep 10, 2020
Merged

Split Markdown.* from Controls package. #3437

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
323cfd7
Created a new Microsoft.Toolkit.Uwp.UI.Controls.Markdown package, mov…
azchohfi Aug 18, 2020
bac2461
Fixed indentation o design projects.
azchohfi Aug 18, 2020
834531c
Added 2 extra commands for each Formatter of TextToolbar.
azchohfi Aug 18, 2020
f999541
Update Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextTo…
azchohfi Aug 19, 2020
16d8ac0
Update Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextTo…
azchohfi Aug 19, 2020
4f3bbd1
Update Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Even…
azchohfi Aug 19, 2020
acf41ac
Update Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
azchohfi Aug 19, 2020
db905f3
Merge branch 'master' into splitMarkdown
azchohfi Aug 19, 2020
5b2af56
Null check on Formatter, and using pattern matching on TextToolbar.
azchohfi Aug 20, 2020
c80e154
Applied PR feedback.
azchohfi Aug 20, 2020
32f36c8
Replaced ToolbarFormatterActiveConverter to a generic TypeToObjectCon…
azchohfi Aug 20, 2020
7dc87f3
Merge branch 'master' into splitMarkdown
azchohfi Aug 24, 2020
25f0c9f
Move About.txt info to the ThirdPartyNotice file instead.
michael-hawker Sep 10, 2020
622c186
Merge branch 'master' into splitMarkdown
michael-hawker Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,6 +1541,10 @@
<Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj">
<Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
<Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
Expand Down
12 changes: 12 additions & 0 deletions Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,18 @@ private static Type LookForTypeByName(string typeName)
}
}

// Search in Microsoft.Toolkit.Uwp.UI.Controls.Markdown
var markdownTextBlockType = typeof(MarkdownTextBlock);
assembly = markdownTextBlockType.GetTypeInfo().Assembly;

foreach (var typeInfo in assembly.ExportedTypes)
{
if (typeInfo.Name == typeName)
{
return typeInfo;
}
}

return null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...oft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// See the LICENSE file in the project root for more information.

using System;
using Windows.UI;
using Microsoft.Toolkit.Uwp.SampleApp.Enums;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Microsoft.Toolkit.Uwp.SampleApp.Enums;

namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
{
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.Toolkit.Uwp.UI.Controls;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using System;
using System.Collections.Generic;
using System.Windows.Input;
using Microsoft.Toolkit.Uwp.UI.Controls;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

Expand Down
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MarkdownParserPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MarkdownParser"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
Expand Down
7 changes: 4 additions & 3 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/SampleFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples
{
public class SampleFormatter : Formatter
{
public SampleFormatter(TextToolbar model)
: base(model)
public override void SetModel(TextToolbar model)
{
base.SetModel(model);

CommonButtons = new CommonButtons(model);
}

Expand All @@ -31,6 +32,6 @@ public override ButtonMap DefaultButtons
}
}

private CommonButtons CommonButtons { get; }
private CommonButtons CommonButtons { get; set; }
}
}
19 changes: 14 additions & 5 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
xmlns:markDown="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown"
xmlns:richText="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText"
xmlns:textToolbarSamples="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
mc:Ignorable="d">

<Page.Resources>
<converters:ToolbarFormatActiveConverter x:Key="IsFormatMarkdown"
Format="MarkDown" />
<converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
</Page.Resources>

<Grid x:Name="MainGrid"
Expand All @@ -22,9 +25,15 @@
<controls:TextToolbar x:Name="Toolbar"
Editor="{Binding ElementName=EditZone}"
IsEnabled="@[IsEnabled:Bool:True]"
Format="@[Format:Enum:Format.RichText]@"
UseURIChecker="@[UseURIChecker:Bool:True]"
Background="#4C4F4F4F" />
Background="#4C4F4F4F">
<controls:TextToolbar.Formatter>
<!-- Choose one -->
<richText:RichTextFormatter />
<!--<markDown:MarkDownFormatter />-->
<!--<textToolbarSamples:SampleFormatter />-->
</controls:TextToolbar.Formatter>
</controls:TextToolbar>

<ScrollViewer Grid.Row="1">
<Grid>
Expand All @@ -46,7 +55,7 @@
<Grid x:Name="MD"
Grid.Row="1"
Margin="0, 16"
Visibility="{Binding Format, ElementName=Toolbar, Mode=OneWay, Converter={StaticResource IsFormatMarkdown}}">
Visibility="{Binding Formatter, ElementName=Toolbar, Mode=OneWay, Converter={StaticResource IsMarkdownFormatter}}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition />
Expand Down
3 changes: 1 addition & 2 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ private void EditZone_TextChanged(object sender, Windows.UI.Xaml.RoutedEventArgs

private void UseCustomFormatter()
{
var formatter = new SampleFormatter(Toolbar);
Toolbar.Format = UI.Controls.TextToolbarFormats.Format.Custom;
var formatter = new SampleFormatter();
Toolbar.Formatter = formatter;
}

Expand Down
23 changes: 20 additions & 3 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,34 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
xmlns:markDown="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown"
xmlns:richText="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText"
xmlns:textToolbarSamples="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Page.Resources>
<converters:ToolbarFormatActiveConverter x:Key="IsFormatMarkdown"
Format="MarkDown" />
<converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
</Page.Resources>

<Grid>
<controls:TextToolbar />
<controls:TextToolbar>
<controls:TextToolbar.Formatter>
<richText:RichTextFormatter />
</controls:TextToolbar.Formatter>
</controls:TextToolbar>
<controls:TextToolbar>
<controls:TextToolbar.Formatter>
<markDown:MarkDownFormatter />
</controls:TextToolbar.Formatter>
</controls:TextToolbar>
<controls:TextToolbar>
<controls:TextToolbar.Formatter>
<textToolbarSamples:SampleFormatter />
</controls:TextToolbar.Formatter>
</controls:TextToolbar>
<RichEditBox />
<controls:MarkdownTextBlock />
</Grid>
Expand Down
30 changes: 2 additions & 28 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Toolkit.Uwp.SampleApp.Models;
using Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples;
using Microsoft.Toolkit.Uwp.UI.Controls;
using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats;
using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.System;
Expand Down Expand Up @@ -43,11 +39,6 @@ public void OnXamlRendered(FrameworkElement control)
_previewer = previewer;
_previewer.LinkClicked += Previewer_LinkClicked;
}

if (ToolbarFormat != null && (Format)ToolbarFormat.Value == Format.Custom)
{
UseCustomFormatter();
}
}

private void Load()
Expand Down Expand Up @@ -99,13 +90,12 @@ private void ResetLayout()

private void UseCustomFormatter()
{
if (_toolbar == null || ToolbarFormat == null)
if (_toolbar == null)
{
return;
}

var formatter = new SampleFormatter(_toolbar);
ToolbarFormat.Value = Format.Custom;
var formatter = new SampleFormatter();
_toolbar.Formatter = formatter;
}

Expand Down Expand Up @@ -179,21 +169,5 @@ private void EditZone_TextChanged(object sender, RoutedEventArgs e)
}

private int DemoCounter { get; set; } = 0;

private ValueHolder ToolbarFormat
{
get
{
if (DataContext is Sample sample)
{
if (sample.PropertyDescriptor.Expando is IDictionary<string, object> properties && properties.TryGetValue("Format", out var format))
{
return format as ValueHolder;
}
}

return null;
}
}
}
}
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
<Compile Include="InAppNotificationMetadata.cs" />
<Compile Include="LayoutTransitionControlMetadata.cs" />
<Compile Include="LoadingMetadata.cs" />
<Compile Include="MarkdownTextBlockMetadata.cs" />
<Compile Include="MasterDetailsViewMetadata.cs" />
<Compile Include="MenuItemMetadata.cs" />
<Compile Include="MenuMetadata.cs" />
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public TextToolbarMetadata()
b =>
{
b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(TextToolbar.Format), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(TextToolbar.Formatter), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(TextToolbar.DefaultButtons), new CategoryAttribute(Properties.Resources.CategoryCommon));
b.AddCustomAttributes(nameof(TextToolbar.CustomButtons), new CategoryAttribute(Properties.Resources.CategoryCommon));
Expand Down
Loading