Skip to content

Commit bd2371c

Browse files
dr1rrbdr1rrb
committed
feat(swipecontrol): Add source commit id in headers
1 parent 3bfc847 commit bd2371c

28 files changed

+2141
-2154
lines changed

‎src/SamplesApp/UITests.Shared/UITests.Shared.projitems

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,10 +1501,6 @@
15011501
<SubType>Designer</SubType>
15021502
<Generator>MSBuild:Compile</Generator>
15031503
</Page>
1504-
<Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipePage.xaml">
1505-
<SubType>Designer</SubType>
1506-
<Generator>MSBuild:Compile</Generator>
1507-
</Page>
15081504
<Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SymbolIconTests\SymbolIcon_Generic.xaml">
15091505
<SubType>Designer</SubType>
15101506
<Generator>MSBuild:Compile</Generator>
@@ -5069,9 +5065,6 @@
50695065
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipeControlPage2.xaml.cs">
50705066
<DependentUpon>SwipeControlPage2.xaml</DependentUpon>
50715067
</Compile>
5072-
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipePage.xaml.cs">
5073-
<DependentUpon>SwipePage.xaml</DependentUpon>
5074-
</Compile>
50755068
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\TestCommand.cs" />
50765069
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SymbolIconTests\SymbolIcon_Generic.xaml.cs">
50775070
<DependentUpon>SymbolIcon_Generic.xaml</DependentUpon>

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlClearPage.xaml.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
5+
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml.cs
6+
47
using System;
58
using Windows.UI.Xaml;
9+
using Windows.UI.Xaml.Controls;
610

711
namespace MUXControlsTestApp
812
{
913
/// <summary>
1014
/// Test page used for clearing existing SwipeControls
1115
/// </summary>
12-
public sealed partial class SwipeControlClearPage : TestPage
16+
public sealed partial class SwipeControlClearPage : Page //: TestPage
1317
{
1418
private string[] items = new string[] { "some text" };
1519

@@ -29,7 +33,7 @@ public void AddSwipeItemsButton_Click(object sender, RoutedEventArgs e)
2933
DefaultSwipeItemsHorizontal.Clear();
3034
DefaultSwipeItemsVertical.Clear();
3135

32-
DefaultSwipeItemsHorizontal.Mode = Microsoft.UI.Xaml.Controls.SwipeMode.Reveal;
36+
DefaultSwipeItemsHorizontal.Mode = SwipeMode.Reveal;
3337
DefaultSwipeItemsHorizontal.Add(DefaultSwipeItemHorizontal);
3438

3539
// Using swipecontrol inside datatemplate prevents us from setting that:

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlPage.xaml.cs

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
5+
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml.cs
6+
47
using System;
58
using System.Collections.Generic;
69
using System.Numerics;
@@ -15,18 +18,18 @@
1518
using Windows.UI.Xaml.Navigation;
1619
using SwipeControl_TestUI;
1720

18-
using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
19-
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
20-
using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
21-
using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
22-
using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
23-
using SwipeTestHooks = Microsoft.UI.Private.Controls.SwipeTestHooks;
24-
using MUXControlsTestHooks = Microsoft.UI.Private.Controls.MUXControlsTestHooks;
25-
using MUXControlsTestHooksLoggingMessageEventArgs = Microsoft.UI.Private.Controls.MUXControlsTestHooksLoggingMessageEventArgs;
21+
//using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
22+
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
23+
//using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
24+
//using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
25+
//using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
26+
//using SwipeTestHooks = Microsoft.UI.Private.Controls.SwipeTestHooks;
27+
//using MUXControlsTestHooks = Microsoft.UI.Private.Controls.MUXControlsTestHooks;
28+
//using MUXControlsTestHooksLoggingMessageEventArgs = Microsoft.UI.Private.Controls.MUXControlsTestHooksLoggingMessageEventArgs;
2629

2730
namespace MUXControlsTestApp
2831
{
29-
public sealed partial class SwipeControlPage : TestPage
32+
public sealed partial class SwipeControlPage : Page //: TestPage
3033
{
3134
object asyncEventReportingLock = new object();
3235
List<string> lstAsyncEventMessage = new List<string>();
@@ -44,7 +47,7 @@ public SwipeControlPage()
4447

4548
this.InitializeComponent();
4649
Container.SizeChanged += ContainerSizeChangedHandler;
47-
SwipeTestHooks.LastInteractedWithSwipeControlChanged += SwipeTestHooks_LastInteractedWithSwipeControlChanged;
50+
SwipeTestHooks.LastInteractedWithSwipeControlChanged += SwipeTestHooks_LastInteractedWithSwipeControlChanged;
4851
MaterialHelperTestApiSetup();
4952

5053
if (ApiInformation.IsTypePresent("Windows.UI.Xaml.Input.XamlUICommand"))
@@ -66,8 +69,9 @@ public SwipeControlPage()
6669

6770
if (chkLogSwipeControlMessages.IsChecked == true)
6871
{
69-
MUXControlsTestHooks.SetLoggingLevelForType("SwipeControl", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
70-
MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
72+
// TODO UNO
73+
//MUXControlsTestHooks.SetLoggingLevelForType("SwipeControl", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
74+
//MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
7175
}
7276
}
7377

@@ -797,4 +801,4 @@ private void BtnClearFullLog_Click(object sender, RoutedEventArgs e)
797801
cmbFullLog.Items.Clear();
798802
}
799803
}
800-
}
804+
}

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlPage2.xaml.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
5+
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage2.xaml.cs
6+
47
using System;
58
using System.Collections.Generic;
69
using System.IO;
@@ -18,17 +21,17 @@
1821
using Windows.UI.Xaml.Automation.Peers;
1922
using Windows.UI;
2023

21-
using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
22-
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
23-
using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
24-
using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
25-
using SwipeBehaviorOnInvoked = Microsoft.UI.Xaml.Controls.SwipeBehaviorOnInvoked;
26-
using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
27-
using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
24+
//using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
25+
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
26+
//using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
27+
//using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
28+
//using SwipeBehaviorOnInvoked = Microsoft.UI.Xaml.Controls.SwipeBehaviorOnInvoked;
29+
//using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
30+
//using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
2831

2932
namespace MUXControlsTestApp
3033
{
31-
public sealed partial class SwipeControlPage2 : TestPage
34+
public sealed partial class SwipeControlPage2 : Page //: TestPage
3235
{
3336
SwipeItem pastSender;
3437
public SwipeControlPage2()

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/SwipePage.xaml

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/SwipePage.xaml.cs

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/SwipeControlTests/TestCommand.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
5+
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/TestCommand.cs
6+
47
using MUXControlsTestApp;
58
using System;
69
using System.Collections.Generic;

‎src/Uno.UI.RuntimeTests/MUX/Windows_UI_Xaml_Controls/SwipeControl/SwipeControl_APITests.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
5+
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_APITests/SwipeControlTests.cs
6+
47
using MUXControlsTestApp.Utilities;
58
using System;
69
using System.Threading;
@@ -19,16 +22,16 @@
1922
using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
2023
#endif
2124

22-
using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
23-
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
24-
using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
25-
using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
26-
using FontIconSource = Microsoft.UI.Xaml.Controls.FontIconSource;
25+
//using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
26+
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
27+
//using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
28+
//using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
29+
//using FontIconSource = Microsoft.UI.Xaml.Controls.FontIconSource;
2730

2831
namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
2932
{
3033
[TestClass]
31-
public class SwipeControlTests : ApiTestBase
34+
public class SwipeControlTests : MUXApiTestBase
3235
{
3336
[TestMethod]
3437
public void SwipeItemTest()

0 commit comments

Comments
 (0)