Skip to content
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

Jump to bottom

New tile carousel on home page + tiles for community & accessibility #1131

Merged
merged 8 commits into from
Jan 31, 2023
Merged

New tile carousel on home page + tiles for community & accessibility #1131

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c28a6c
Added toolkit tile
gregwoo-microsoft Dec 2, 2022
2336298
Created new folder for tile images
gregwoo-microsoft Dec 2, 2022
3f6d750
Fixed toolkit link on the datagrid page
gregwoo-microsoft Dec 10, 2022
944fdb5
Added a carousel like feature + new Accessibility tile
gregwoo-microsoft Jan 13, 2023
e99f3cc
Fixed the name of the Accessibility tile
gregwoo-microsoft Jan 13, 2023
323fdb5
Adding tile gallery
niels9001 Jan 20, 2023
91ab630
Merge pull request #2 from niels9001/user/niels9001/toolkittiletweaks
gregwoo-microsoft Jan 24, 2023
00a6f3d
Handling merge conflict
gregwoo-microsoft Jan 31, 2023
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
0 WinUIGallery/Assets/gettingStarted.png → ...Assets/HomeHeaderTiles/gettingStarted.png
View file
Open in desktop
File renamed without changes
0 WinUIGallery/Assets/githubTile.png → ...ery/Assets/HomeHeaderTiles/githubTile.png
View file
Open in desktop
File renamed without changes
0 WinUIGallery/Assets/style-1x.png → ...llery/Assets/HomeHeaderTiles/style-1x.png
View file
Open in desktop
File renamed without changes
0 WinUIGallery/Assets/template_studio.png → ...ssets/HomeHeaderTiles/template_studio.png
View file
Open in desktop
File renamed without changes
Binary file added WinUIGallery/Assets/HomeHeaderTiles/toolkit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions WinUIGallery/ContentIncludes.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,11 @@
<Content Include="Assets\ControlImages\WebView.png" />
<Content Include="Assets\ControlImages\XamlUICommand.png" />

<Content Include="Assets\gettingStarted.png" />
<Content Include="Assets\githubTile.png" />
<Content Include="Assets\style-1x.png" />
<Content Include="Assets\template_studio.png" />
<Content Include="Assets\HomeHeaderTiles\gettingStarted.png" />
<Content Include="Assets\HomeHeaderTiles\githubTile.png" />
<Content Include="Assets\HomeHeaderTiles\style-1x.png" />
<Content Include="Assets\HomeHeaderTiles\template_studio.png" />
<Content Include="Assets\HomeHeaderTiles\toolkit.png" />
<Content Include="Assets\NavigationViewItemIcons\AllControlsIcon.png" />
<Content Include="Assets\NavigationViewItemIcons\ButtonsIcon.png" />
<Content Include="Assets\NavigationViewItemIcons\CollectionIcon.png" />
Expand Down
21 changes: 13 additions & 8 deletions WinUIGallery/ControlPages/DataGridPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Windows.System;

namespace AppUIBasics.ControlPages
{
Expand All @@ -13,14 +14,18 @@ public DataGridPage()

private async void LaunchToolkitButton_Click(object sender, RoutedEventArgs e)
{
// Set the recommended app
var options = new Windows.System.LauncherOptions
{
PreferredApplicationPackageFamilyName = "Microsoft.UWPCommunityToolkitSampleApp_8wekyb3d8bbwe",
PreferredApplicationDisplayName = "Windows Community Toolkit"
};
// Either open the app if already instealled or the Microsoft Store

var isToolkitAvailable = await Windows.System.Launcher.QueryUriSupportAsync(new Uri("uwpct://controls?sample=datagrid"), Windows.System.LaunchQuerySupportType.Uri);

await Windows.System.Launcher.LaunchUriAsync(new Uri("uwpct://controls?sample=datagrid"), options);
if (isToolkitAvailable == LaunchQuerySupportStatus.Available)
{
await Windows.System.Launcher.LaunchUriAsync(new Uri("uwpct://controls?sample=datagrid"));
}
else
{
await Windows.System.Launcher.LaunchUriAsync(new Uri(@"ms-windows-store://pdp/?ProductId=9NBLGGH4TLCQ"));
}
}
}
}
9 changes: 5 additions & 4 deletions WinUIGallery/NewControlsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,11 @@
</StackPanel>
<StackPanel x:Name="HeaderTileOuterGrid" Orientation="Horizontal">
<VariableSizedWrapGrid x:Name="HeaderTileGrid" Orientation="Horizontal" Margin="0,287,0,0">
<controls:HeaderTile Title="Getting Started" Source="/Assets/gettingStarted.png" Link="https://docs.microsoft.com/windows/apps/get-started/"/>
<controls:HeaderTile Title="Windows Design" Source="/Assets/style-1x.png" Link="https://docs.microsoft.com/windows/apps/design/"/>
<controls:HeaderTile Title="GitHub Repo" Source="/Assets/githubTile.png" Link="https://github.com/microsoft/microsoft-ui-xaml"/>
<controls:HeaderTile Title="Template Studio" Source="/Assets/template_studio.png" Link="https://marketplace.visualstudio.com/items?itemName=TemplateStudio.TemplateStudioForWinUICs"/>
<controls:HeaderTile Title="Getting Started" Source="/Assets/HomeHeaderTiles/gettingStarted.png" Link="https://docs.microsoft.com/windows/apps/get-started/"/>
<controls:HeaderTile Title="Windows Design" Source="/Assets/HomeHeaderTiles/style-1x.png" Link="https://docs.microsoft.com/windows/apps/design/"/>
<controls:HeaderTile Title="WinUI Repo" Source="/Assets/HomeHeaderTiles/githubTile.png" Link="https://github.com/microsoft/microsoft-ui-xaml"/>
<controls:HeaderTile Title="Template Studio" Source="/Assets/HomeHeaderTiles/template_studio.png" Link="https://marketplace.visualstudio.com/items?itemName=TemplateStudio.TemplateStudioForWinUICs"/>
<controls:HeaderTile Title="Community Toolkit" Source="/Assets/HomeHeaderTiles/toolkit.png" Link="https://apps.microsoft.com/store/detail/windows-community-toolkit-sample-app/9NBLGGH4TLCQ"/>
Copy link
Collaborator

@niels9001 niels9001 Dec 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EDIT: Actually no, linking directly to the Gallery app (so hopefully it opens directly) makes most sense :)

</VariableSizedWrapGrid>
</StackPanel>
</Grid>
Expand Down