Skip to content

Commit

Permalink
Merge pull request #33 from Zaitonn/main
Browse files Browse the repository at this point in the history
新增两个Frame的方法重载&其他一些小更改
  • Loading branch information
NotYoojun authored Jan 9, 2024
2 parents 9d673fc + 834f9d1 commit 0bd4719
Show file tree
Hide file tree
Showing 37 changed files with 58 additions and 542 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
continue-on-error: true
run: |
dotnet build .\source\iNKORE.UI.WPF.Modern
dotnet build .\source\iNKORE.UI.WPF.Modern.Gallery
dotnet publish .\source\iNKORE.UI.WPF.Modern.Gallery -r win-x64 -f net6.0-windows10.0.18362.0 --no-self-contained -p:PublishSingleFile=true -p:IncludeContentInSingleFile=true
# dotnet pack .\source\iNKORE.UI.WPF.Modern.Controls --configuration Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg

- name: Upload binary libraries of iNKORE.UI.WPF.Modern.Controls
Expand All @@ -33,8 +33,8 @@ jobs:
name: iNKORE.UI.WPF.Modern.Controls dlls
path: .\source\iNKORE.UI.WPF.Modern.Controls\bin\Debug

- name: Upload sample apps
- name: Upload Gallery apps
uses: actions/upload-artifact@v3
with:
name: iNKORE.UI.WPF.Modern.Gallery files
path: .\source\iNKORE.UI.WPF.Modern.Gallery\bin\Debug
name: iNKORE.UI.WPF.Modern.Gallery
path: .\source\iNKORE.UI.WPF.Modern.Gallery\bin\Debug\net6.0-windows10.0.18362.0\win-x64\publish
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<a href="#"><img src="https://img.shields.io/github/v/release/iNKOREStudios/UI.WPF.Modern?color=%4CF4A8B4" alt="Latest Version"></a>
<a href="#"><img src="https://img.shields.io/github/release-date/iNKOREStudios/UI.WPF.Modern?color=%23b0a3e8" alt="Release Date"></a>
<a href="https://github.com/iNKOREStudios/UI.WPF.Modern/commits/"><img src="https://img.shields.io/github/commit-activity/m/iNKOREStudios/UI.WPF.Modern" alt="Commit Activity"></a>
<a href="https://www.nuget.org/packages/iNKORE.UI.WPF.Modern"><img src="https://img.shields.io/nuget/v/iNKORE.UI.WPF.Modern?color=blue&logo=nuget" alt="Nuget latest version"></a>
<a href="https://www.nuget.org/packages/iNKORE.UI.WPF.Modern"><img src="https://img.shields.io/nuget/dt/iNKORE.UI.WPF.Modern?color=blue&logo=nuget" alt="Nuget download conut"></a>
</p>

<p align="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
<RootNamespace>iNKORE.UI.WPF.Modern</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>

<!--<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ private void ForwardButton1_Click(object sender, RoutedEventArgs e)
if (_transitionInfo == null)
{
// Default behavior, no transition set or used.
ContentFrame.Navigate(pageToNavigateTo, null);
ContentFrame.Navigate(sourcePageType: pageToNavigateTo, null);
}
else
{
// Explicit transition info used.
ContentFrame.Navigate(pageToNavigateTo, null, _transitionInfo);
ContentFrame.Navigate(sourcePageType: pageToNavigateTo, null, _transitionInfo);
}
}

Expand Down
10 changes: 0 additions & 10 deletions source/iNKORE.UI.WPF.Modern/Common/AnimatedIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.Windows;
*/
using iNKORE.UI.WPF.Modern.Controls;
using System.Windows;
using System.Windows.Media;

namespace iNKORE.UI.WPF.Modern.Common
{
Expand Down
9 changes: 0 additions & 9 deletions source/iNKORE.UI.WPF.Modern/Common/BitmapIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System;
*/
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Windows;
Expand Down
9 changes: 0 additions & 9 deletions source/iNKORE.UI.WPF.Modern/Common/FontIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.Windows;
*/
using iNKORE.UI.WPF.Modern.Controls;
using System.Windows;
using System.Windows.Media;
Expand Down
9 changes: 0 additions & 9 deletions source/iNKORE.UI.WPF.Modern/Common/IconSource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.Windows;
*/
using System.Windows;
using System.Windows.Media;
using iNKORE.UI.WPF.Modern.Controls;
Expand Down
11 changes: 1 addition & 10 deletions source/iNKORE.UI.WPF.Modern/Common/ImageIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System;
*/
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Windows;
using System.Windows.Controls;
Expand Down
9 changes: 0 additions & 9 deletions source/iNKORE.UI.WPF.Modern/Common/PathIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.Windows;
*/
using iNKORE.UI.WPF.Modern.Controls;
using System.Windows;
using System.Windows.Media;
Expand Down
9 changes: 0 additions & 9 deletions source/iNKORE.UI.WPF.Modern/Common/SymbolIconSource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.Windows;
*/
using iNKORE.UI.WPF.Modern.Controls;
using System.Windows;

Expand Down
14 changes: 0 additions & 14 deletions source/iNKORE.UI.WPF.Modern/Controls/AcrylicElement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,6 @@
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data;

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows.Media;
在此之后:
using System.Windows.Media;
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.Acrylic;
*/
using System.Windows.Media;

namespace iNKORE.UI.WPF.Modern.Controls
Expand Down
12 changes: 0 additions & 12 deletions source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
// Ported from https://github.com/sourcechord/FluentWPF/blob/master/FluentWPF/AcrylicPanel.cs


/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using iNKORE.UI.WPF.Modern.Controls.Primitives;
在此之后:
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern.Controls.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.Acrylic;
using iNKORE.UI.WPF.Modern.Controls.Primitives;
*/
using iNKORE.UI.WPF.Modern.Controls.Primitives;
using System;
using System.Collections.Generic;
Expand Down
14 changes: 0 additions & 14 deletions source/iNKORE.UI.WPF.Modern/Controls/AnimatedBackVisualSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,6 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows;
在此之后:
using System.Windows;
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.AnimatedVisuals;
*/
using System.Windows;

namespace iNKORE.UI.WPF.Modern.Controls
Expand Down
24 changes: 1 addition & 23 deletions source/iNKORE.UI.WPF.Modern/Controls/AnimatedIcon.cs
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System;
*/

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Controls.AnimatedVisuals;
在此之后:
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.AnimatedVisuals;
*/
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Common;
using System;
using System.Collections.Generic;
using System.ComponentModel;
Expand Down
17 changes: 1 addition & 16 deletions source/iNKORE.UI.WPF.Modern/Controls/AnimatedVisualSource.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using iNKORE.UI.WPF.Modern.Common;
using System;
在此之后:
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.AnimatedVisuals;
using System;
*/
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Common;
using System;
using System.Collections.Generic;
using System.ComponentModel;
Expand Down
25 changes: 1 addition & 24 deletions source/iNKORE.UI.WPF.Modern/Controls/BitmapIcon.cs
Original file line number Diff line number Diff line change
@@ -1,31 +1,8 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System;
*/
using System;
using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows.Shapes;
在此之后:
using System.Windows.Shapes;
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.IconElement;
*/
using System.Windows.Shapes;

namespace iNKORE.UI.WPF.Modern.Controls
Expand Down
25 changes: 1 addition & 24 deletions source/iNKORE.UI.WPF.Modern/Controls/FontIcon.cs
Original file line number Diff line number Diff line change
@@ -1,30 +1,7 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.ComponentModel;
在此之后:
using iNKORE.UI.WPF.Modern.Controls.IconElement;
using iNKORE.UI.WPF.Modern.Controls.IconElement.IconElement;
using System.ComponentModel;
*/
using iNKORE.UI.WPF.Modern.Common;
using iNKORE.UI.WPF.Modern.Common;
using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using System.Windows.Media;
在此之后:
using System.Windows.Media;
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.IconElement;
*/
using System.Windows.Media;

namespace iNKORE.UI.WPF.Modern.Controls
Expand Down
41 changes: 27 additions & 14 deletions source/iNKORE.UI.WPF.Modern/Controls/Frame.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@

/* 项目“iNKORE.UI.WPF.Modern (net452)”的未合并的更改
在此之前:
using iNKORE.UI.WPF.Modern.Helpers;
在此之后:
using iNKORE;
using iNKORE.UI;
using iNKORE.UI.WPF;
using iNKORE.UI.WPF.Modern.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls.Navigation;
using iNKORE.UI.WPF.Modern.Helpers;
*/
using iNKORE.UI.WPF.Modern.Helpers;
using iNKORE.UI.WPF.Modern.Helpers;
using iNKORE.UI.WPF.Modern.Media.Animation;
using System;
using System.Collections.Specialized;
Expand Down Expand Up @@ -278,6 +265,32 @@ public bool Navigate(Type sourcePageType, object parameter, NavigationTransition
return Navigate(Activator.CreateInstance(sourcePageType), parameter);
}

/// <summary>
/// Navigates asynchronously to content that is contained by an object.
/// </summary>
/// <param name="content">An System.Object that contains the content to navigate to.</param>
/// <param name="infoOverride">Info about the animated transition.</param>
/// <returns>true if navigation is not canceled; otherwise, false.</returns>
public bool Navigate(object content, NavigationTransitionInfo infoOverride)
{
_transitionInfoOverride = infoOverride;
return Navigate(content);
}

/// <summary>
/// Navigates asynchronously to content that is contained by an object, and passes
/// an object that contains data to be used for processing during navigation.
/// </summary>
/// <param name="content">An System.Object that contains the content to navigate to.</param>
/// <param name="extraData">A System.Object that contains data to be used for processing during navigation.</param>
/// <param name="infoOverride">Info about the animated transition.</param>
/// <returns>true if navigation is not canceled; otherwise, false.</returns>
public bool Navigate(object content, object extraData, NavigationTransitionInfo infoOverride)
{
_transitionInfoOverride = infoOverride;
return Navigate(content, extraData);
}

/// <summary>
/// Navigates asynchronously to source content located at a uniform resource identifier
/// (URI), and passes an object that contains data to be used for processing during
Expand Down
Loading

0 comments on commit 0bd4719

Please sign in to comment.