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.

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

Replace AppUIBasics to WinUIGallery Namespace #1446

Merged
merged 4 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions WinUIGallery/AllControlsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
//*********************************************************
-->
<local:ItemsPageBase
x:Class="AppUIBasics.AllControlsPage"
x:Class="WinUIGallery.AllControlsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:AppUIBasics.Controls"
xmlns:local="using:AppUIBasics"
xmlns:controls="using:WinUIGallery.Controls"
xmlns:local="using:WinUIGallery"
HighContrastAdjustment="None"
NavigationCacheMode="Enabled">

Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/AllControlsPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
//
//*********************************************************
using AppUIBasics.Data;
using WinUIGallery.Data;
using System.Linq;
using Microsoft.UI.Xaml.Navigation;

namespace AppUIBasics
namespace WinUIGallery
{
/// <summary>
/// A page that displays a grouped collection of items.
Expand Down
6 changes: 3 additions & 3 deletions WinUIGallery/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
//*********************************************************
-->
<Application
x:Class="AppUIBasics.App"
x:Class="WinUIGallery.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:AppUIBasics.Common"
xmlns:local="using:AppUIBasics">
xmlns:common="using:WinUIGallery.Common"
xmlns:local="using:WinUIGallery">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
Expand Down
9 changes: 4 additions & 5 deletions WinUIGallery/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,18 @@
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using AppUIBasics.Common;
using AppUIBasics.Data;
using AppUIBasics.Helper;
using WinUIGallery.Common;
using WinUIGallery.Data;
using WinUIGallery.Helper;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using Microsoft.Windows.AppLifecycle;
using Windows.ApplicationModel.Activation;
using WinUIGallery.DesktopWap.DataModel;
using WASDK = Microsoft.WindowsAppSDK;
using WinUIGallery.Helper;

namespace AppUIBasics
namespace WinUIGallery
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Behaviors/ImageScrollBehavior.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AppUIBasics.Helper;
using WinUIGallery.Helper;
using Microsoft.Xaml.Interactivity;
using System.Linq;
using Windows.Storage;
Expand All @@ -7,7 +7,7 @@
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;

namespace AppUIBasics.Behaviors
namespace WinUIGallery.Behaviors
{
public class ImageScrollBehavior : DependencyObject, IBehavior
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/CollectionsInterop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

using NotifyCollectionChangedAction = Microsoft.UI.Xaml.Interop.NotifyCollectionChangedAction;

namespace AppUIBasics
namespace WinUIGallery
{
// .NET collection types are tightly coupled with WUX types - e.g., ObservableCollection<T>
// maps to WUX.INotifyCollectionChanged, and creates WUX.NotifyCollectionChangedEventArgs
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/ActivityFeedLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using VirtualizingLayout = Microsoft.UI.Xaml.Controls.VirtualizingLayout;
using VirtualizingLayoutContext = Microsoft.UI.Xaml.Controls.VirtualizingLayoutContext;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
class ActivityFeedLayout : VirtualizingLayout
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public sealed class BooleanToInvertedVisibilityConverter: IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/BooleanToValueConverter.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public sealed class BooleanToValueConverter: IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/Category.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Microsoft.UI.Xaml.Controls;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{

public class CategoryBase { }
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/ColorSlideTransitionHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Hosting;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
/// <summary>
/// A helper class encapsulating the function and visuals for a Color Slide transition animation.
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/DefaultElementAnimator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Hosting;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
#if WINUI_PRERELEASE
public class DefaultElementAnimator : ElementAnimator
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/DeviceFamilyTrigger.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Windows.System.Profile;
using Microsoft.UI.Xaml;

namespace AppUIBasics
namespace WinUIGallery
{
// https://learn.microsoft.com/windows/apps/design/devices/designing-for-tv#custom-visual-state-trigger-for-xbox
class DeviceFamilyTrigger : StateTriggerBase
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/DoubleToThicknessConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
class DoubleToThicknessConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/EmptyStringToVisibilityConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public class EmptyStringToVisibilityConverter : IValueConverter
{
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Common/FileLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
using System.Linq;
using System.Threading.Tasks;
using Windows.Storage;
using AppUIBasics.Helper;
using WinUIGallery.Helper;
using System.IO;
using System.Reflection;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
internal class FileLoader
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/LanguageList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
class LanguageList
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/MenuItemTemplateSelector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.UI.Xaml.Markup;
using System;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{

[ContentProperty(Name = "ItemTemplate")]
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/NullToVisibilityConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public class NullToVisibilityConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/NullableBooleanToBooleanConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Microsoft.UI.Xaml.Data;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public class NullableBooleanToBooleanConverter : IValueConverter
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/ObservableDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using Windows.Foundation.Collections;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
/// <summary>
/// Implementation of IObservableMap that supports reentrancy for use as a default view
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/OrientedSize.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Microsoft.UI.Xaml.Controls;

namespace AppUIBasics
namespace WinUIGallery
{
/// <summary>
/// The OrientedSize structure is used to abstract the growth direction from
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/RelayCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
using System.Windows.Input;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
/// <summary>
/// A command whose sole purpose is to relay its functionality
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Common/SuspensionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
using Windows.Storage.Streams;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using AppUIBasics.Helper;
using WinUIGallery.Helper;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
/// <summary>
/// SuspensionManager captures global session state to simplify process lifetime management
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/VariedImageSizeLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using VirtualizingLayout = Microsoft.UI.Xaml.Controls.VirtualizingLayout;
using VirtualizingLayoutContext = Microsoft.UI.Xaml.Controls.VirtualizingLayoutContext;

namespace AppUIBasics.Common
namespace WinUIGallery.Common
{
public class VariedImageSizeLayout : VirtualizingLayout
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/Win32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace AppUIBasics
namespace WinUIGallery
{
internal static class Win32
{
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Common/WrapPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;

namespace AppUIBasics
namespace WinUIGallery
{
/// <summary>
/// Positions child elements sequentially from left to right or top to
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ConnectedAnimationPages/CardPage.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Page
x:Class="AppUIBasics.ConnectedAnimationPages.CardPage"
x:Class="WinUIGallery.ConnectedAnimationPages.CardPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ConnectedAnimationPages/CardPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.UI.Xaml.Media.Animation;
using Windows.Foundation.Metadata;

namespace AppUIBasics.ConnectedAnimationPages
namespace WinUIGallery.ConnectedAnimationPages
{
public sealed partial class CardPage : Page
{
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Page
x:Class="AppUIBasics.ConnectedAnimationPages.CollectionPage"
x:Class="WinUIGallery.ConnectedAnimationPages.CollectionPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:AppUIBasics.ControlPages"
xmlns:local="using:WinUIGallery.ControlPages"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
Expand Down
6 changes: 3 additions & 3 deletions WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.UI.Xaml.Navigation;
using AppUIBasics.ControlPages;
using WinUIGallery.ControlPages;
using Windows.Foundation.Metadata;

namespace AppUIBasics.ConnectedAnimationPages
namespace WinUIGallery.ConnectedAnimationPages
{
public sealed partial class CollectionPage : Page
{
Expand All @@ -19,7 +19,7 @@ public CollectionPage()
// Ensure that the MainPage is only created once, and cached during navigation.
this.NavigationCacheMode = NavigationCacheMode.Enabled;

collection.ItemsSource = AppUIBasics.ControlPages.CustomDataObject.GetDataObjects();
collection.ItemsSource = WinUIGallery.ControlPages.CustomDataObject.GetDataObjects();
}

private async void collection_Loaded(object sender, RoutedEventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ConnectedAnimationPages/DetailedInfoPage.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Page
x:Class="AppUIBasics.ConnectedAnimationPages.DetailedInfoPage"
x:Class="WinUIGallery.ConnectedAnimationPages.DetailedInfoPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/ConnectedAnimationPages/DetailedInfoPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using AppUIBasics.ControlPages;
using WinUIGallery.ControlPages;
using Microsoft.UI.Xaml.Media.Animation;

namespace AppUIBasics.ConnectedAnimationPages
namespace WinUIGallery.ConnectedAnimationPages
{
public sealed partial class DetailedInfoPage : Page
{
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/ControlPages/AcrylicPage.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Page
x:Class="AppUIBasics.ControlPages.AcrylicPage"
x:Class="WinUIGallery.ControlPages.AcrylicPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:AppUIBasics"
xmlns:local="using:WinUIGallery"
xmlns:media="using:Microsoft.UI.Xaml.Media"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ControlPages/AcrylicPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;

namespace AppUIBasics.ControlPages
namespace WinUIGallery.ControlPages
{
public sealed partial class AcrylicPage : Page
{
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/ControlPages/AnimatedIconPage.xaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Page
x:Class="AppUIBasics.ControlPages.AnimatedIconPage"
x:Class="WinUIGallery.ControlPages.AnimatedIconPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:local="using:AppUIBasics"
xmlns:local="using:WinUIGallery"
mc:Ignorable="d">
<StackPanel>
<local:ControlExample x:Name="AnimatedIconExample1" HeaderText="Adding AnimatedIcon to a button"
Expand Down
Loading