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

refactor: Adjust namespaces related to latest Uno packages #206

Merged
merged 1 commit into from
Dec 3, 2021
Merged

refactor: Adjust namespaces related to latest Uno packages #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion doc/Reactive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Then in your page, you can add a `FeedView`:
x:Class="MyProject.MyPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:reactive="using:Uno.Extensions.Reactive.UI">
xmlns:uer="using:Uno.Extensions.Reactive.UI">

<reactive:FeedView Source="{Binding Products}">
<DataTemplate>
Expand Down
30 changes: 15 additions & 15 deletions samples/Commerce/Commerce.Shared/Styles/FeedView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:reactive="using:Uno.Extensions.Reactive.UI"
xmlns:uer="using:Uno.Extensions.Reactive.UI"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:skia="http://platform.uno/skia"
xmlns:not_skia="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="skia">

<Style TargetType="reactive:FeedView" BasedOn="{StaticResource DefaultFeedViewStyle}">
<Style TargetType="uer:FeedView" BasedOn="{StaticResource DefaultFeedViewStyle}">
<Setter Property="ProgressTemplate">
<Setter.Value>
<DataTemplate>
Expand All @@ -31,7 +31,7 @@
</Setter>
</Style>

<Style TargetType="reactive:FeedView" x:Key="MaterialCompositeFeedViewStyle" BasedOn="{StaticResource CompositeFeedViewStyle}">
<Style TargetType="uer:FeedView" x:Key="MaterialCompositeFeedViewStyle" BasedOn="{StaticResource CompositeFeedViewStyle}">
<Setter Property="ProgressTemplate">
<Setter.Value>
<DataTemplate>
Expand All @@ -55,7 +55,7 @@
</Setter>
</Style>

<Style TargetType="reactive:FeedView" x:Key="DefaultFeedViewStyle">
<Style TargetType="uer:FeedView" x:Key="DefaultFeedViewStyle">
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
Expand Down Expand Up @@ -88,14 +88,14 @@
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="reactive:FeedView">
<ControlTemplate TargetType="uer:FeedView">
<Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
<VisualStateManager.CustomVisualStateManager>
<reactive:SmoothVisualStateManager>
<reactive:SmoothVisualStateRule MinDuration="0:0:0.500" />
<reactive:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
</reactive:SmoothVisualStateManager>
<uer:SmoothVisualStateManager>
<uer:SmoothVisualStateRule MinDuration="0:0:0.500" />
<uer:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
</uer:SmoothVisualStateManager>
</VisualStateManager.CustomVisualStateManager>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DataGroup">
Expand Down Expand Up @@ -236,7 +236,7 @@

<!-- We need to redefine this as packages cannot ship multiple styles at once by default.
We need to take a similar approach to what we did for material to pack multiple styles.-->
<Style TargetType="reactive:FeedView" x:Key="CompositeFeedViewStyle">
<Style TargetType="uer:FeedView" x:Key="CompositeFeedViewStyle">
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
Expand Down Expand Up @@ -274,15 +274,15 @@
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="reactive:FeedView">
<ControlTemplate TargetType="uer:FeedView">
<Grid
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
<VisualStateManager.CustomVisualStateManager>
<reactive:SmoothVisualStateManager>
<reactive:SmoothVisualStateRule MinDuration="0:0:0.500" />
<reactive:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
</reactive:SmoothVisualStateManager>
<uer:SmoothVisualStateManager>
<uer:SmoothVisualStateRule MinDuration="0:0:0.500" />
<uer:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
</uer:SmoothVisualStateManager>
</VisualStateManager.CustomVisualStateManager>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DataGroup">
Expand Down
6 changes: 3 additions & 3 deletions samples/Commerce/Commerce.Shared/Views/CartFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Commerce"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
Placement="Full"
FlyoutPresenterStyle="{StaticResource MaterialFlyoutPresenterStyle}">

<Grid>
<ContentControl nav:Region.Attached="True"
<ContentControl uen:Region.Attached="True"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Expand Down
7 changes: 2 additions & 5 deletions samples/Commerce/Commerce.Shared/Views/CartPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
xmlns:local="using:Commerce"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
xmlns:utu="using:Uno.Toolkit.UI"
xmlns:uer="using:Uno.Extensions.Reactive.UI"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
Background="{ThemeResource MaterialBackgroundBrush}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
mc:Ignorable="d">

<utu:AutoLayout MaxWidth="{StaticResource LandscapeMaxPageWidth}"
Background="{StaticResource MaterialBackgroundBrush}">
Expand All @@ -27,7 +24,7 @@
utu:AutoLayout.CounterAlignment="Stretch"
Style="{StaticResource MaterialRootModalNavigationBarStyle}">
<utu:NavigationBar.MainCommand>
<AppBarButton nav:Navigation.Request="../../-"
<AppBarButton uen:Navigation.Request="../../-"
Foreground="{StaticResource MaterialOnSurfaceBrush}" />
</utu:NavigationBar.MainCommand>
</utu:NavigationBar>
Expand Down
6 changes: 3 additions & 3 deletions samples/Commerce/Commerce.Shared/Views/CheckoutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
xmlns:local="using:Commerce"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
xmlns:utu="using:Uno.Toolkit.UI"
mc:Ignorable="d"
Background="{ThemeResource MaterialBackgroundBrush}">

<Grid MinHeight="300"
Expand All @@ -22,7 +22,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Button Content="Done"
nav:Navigation.Request="../../-" />
uen:Navigation.Request="../../-" />
</StackPanel>

</Grid>
Expand Down
10 changes: 4 additions & 6 deletions samples/Commerce/Commerce.Shared/Views/FilterFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:utu="using:Uno.Toolkit.UI"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400"
Placement="Full"
LightDismissOverlayMode="On"
FlyoutPresenterStyle="{StaticResource MaterialFlyoutPresenterStyle}">
Expand Down Expand Up @@ -41,7 +39,7 @@
utu:AutoLayout.CounterAlignment="Stretch"
Style="{StaticResource MaterialRootModalNavigationBarStyle}">
<utu:NavigationBar.MainCommand>
<AppBarButton nav:Navigation.Request="-"
<AppBarButton uen:Navigation.Request="-"
Foreground="{ThemeResource MaterialOnSurfaceBrush}" />
</utu:NavigationBar.MainCommand>
<utu:NavigationBar.PrimaryCommands>
Expand Down Expand Up @@ -136,8 +134,8 @@
x:Uid="Body_Apply"
utu:AutoLayout.PrimaryAlignment="Stretch"
Style="{StaticResource MaterialContainedButtonStyle}"
nav:Navigation.Request="-"
nav:Navigation.Data="{Binding Filter.Value}" />
uen:Navigation.Request="-"
uen:Navigation.Data="{Binding Filter.Value}" />
</utu:AutoLayout>
</utu:AutoLayout>
</utu:AutoLayout>
Expand Down
22 changes: 10 additions & 12 deletions samples/Commerce/Commerce.Shared/Views/FrameView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<UserControl x:Class="Commerce.FrameView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Commerce"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
d:DesignHeight="300"
d:DesignWidth="400">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Commerce"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
mc:Ignorable="d">

<Grid>
<Frame nav:Region.Attached="True"/>
</Grid>
<Grid>
<Frame uen:Region.Attached="True" />
</Grid>
</UserControl>
3 changes: 1 addition & 2 deletions samples/Commerce/Commerce.Shared/Views/LoginPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
xmlns:local="using:ExtensionsSampleApp.Views.Twitter"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:nav="using:Uno.Extensions.Navigation.UI"
xmlns:utu="using:Uno.Toolkit.UI"
mc:Ignorable="d"
Background="{ThemeResource MaterialBackgroundBrush}">

<utu:AutoLayout Background="{StaticResource MaterialBackgroundBrush}"
Expand Down
9 changes: 4 additions & 5 deletions samples/Commerce/Commerce.Shared/Views/ProductDetailsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
xmlns:local="using:Commerce"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:utu="using:Uno.Toolkit.UI"
xmlns:uen="using:Uno.Extensions.Navigation.UI"
xmlns:uer="using:Uno.Extensions.Reactive.UI"
xmlns:um="using:Uno.Material.Extensions"
xmlns:reactive="using:Uno.Extensions.Reactive.UI"
xmlns:um="using:Uno.Material"
mc:Ignorable="d"
Background="{ThemeResource MaterialBackgroundBrush}">

Expand Down Expand Up @@ -115,8 +114,8 @@
x:Uid="_Reviews"
Text="Reviews"
Style="{StaticResource MaterialHeadline6}" />
<controls:RatingControl MaxRating="5"
Value="{Binding Rating, Mode=TwoWay}" />
<muxc:RatingControl MaxRating="5"
Value="{Binding Rating, Mode=TwoWay}" />
</utu:AutoLayout>
</utu:AutoLayout>
</DataTemplate>
Expand Down
Loading