Merge pull request #689 from unoplatform/dev/agzi/MoveEverythingUnder…

…UnoMaterial refactor!: Move everything under the Uno.Material namespace
unoplatform · Dec 1, 2021 · 6a2515e · 6a2515e
2 parents b2adac0 + aeef66c
commit 6a2515e
Show file tree

Hide file tree

Showing 60 changed files with 532 additions and 639 deletions.
diff --git a/src/library/Uno.Cupertino/Styles/Controls/Button.xaml b/src/library/Uno.Cupertino/Styles/Controls/Button.xaml
@@ -1,20 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					xmlns:android="http://uno.ui/android"
-					xmlns:controls="using:Uno.Material.Controls"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-					xmlns:ios="http://uno.ui/ios"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:not_win="http://uno.ui/not_win"
-					xmlns:toolkit="using:Uno.UI.Toolkit"
-					xmlns:wasm="http://uno.ui/wasm"
-					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					mc:Ignorable="d ios android wasm not_win">
+					mc:Ignorable="d">
 
 	<ResourceDictionary.MergedDictionaries>
-		<CupertinoColors xmlns="using:Uno.Cupertino"/>
-		<CupertinoFonts xmlns="using:Uno.Cupertino"/>
+		<CupertinoColors xmlns="using:Uno.Cupertino" />
+		<CupertinoFonts xmlns="using:Uno.Cupertino" />
 		<ResourceDictionary Source="../Application/AnimationConstants.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 

diff --git a/src/library/Uno.Cupertino/Styles/Controls/HyperlinkButton.xaml b/src/library/Uno.Cupertino/Styles/Controls/HyperlinkButton.xaml
@@ -2,13 +2,13 @@
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:winui="using:Microsoft.UI.Xaml.Controls"
 					mc:Ignorable="d">
 
 	<ResourceDictionary.MergedDictionaries>
-		<CupertinoColors xmlns="using:Uno.Cupertino"/>
-		<CupertinoFonts xmlns="using:Uno.Cupertino"/>
+		<CupertinoColors xmlns="using:Uno.Cupertino" />
+		<CupertinoFonts xmlns="using:Uno.Cupertino" />
 	</ResourceDictionary.MergedDictionaries>
+
 	<FontFamily x:Key="CupertinoHyperlinkButtonFontFamily">SF Pro</FontFamily>
 	<x:String x:Key="MinusGlyphPathStyle">M0 1.67236H5.57812V0.327637H0V1.67236Z</x:String>
 

diff --git a/src/library/Uno.Cupertino/Styles/Controls/NumberBox.xaml b/src/library/Uno.Cupertino/Styles/Controls/NumberBox.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					xmlns:winui="using:Microsoft.UI.Xaml.Controls"
-					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006">
+					xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
 
 	<ResourceDictionary.MergedDictionaries>
 		<CupertinoColors xmlns="using:Uno.Cupertino"/>
@@ -28,7 +27,7 @@
 	<CornerRadius x:Key="CupertinoCornerRadius">8</CornerRadius>
 
 	<Style	x:Name="CupertinoNumberBoxStyle"
-			TargetType="winui:NumberBox">
+			TargetType="muxc:NumberBox">
 		<Setter Property="FontFamily"
 				Value="{StaticResource CupertinoFontFamily}" />
 		<Setter Property="Background"
@@ -43,7 +42,7 @@
 				Value="7" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="winui:NumberBox">
+				<ControlTemplate TargetType="muxc:NumberBox">
 					<Grid>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">

diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressBar.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressBar.xaml
@@ -2,15 +2,15 @@
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:winui="using:Microsoft.UI.Xaml.Controls"
+					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					mc:Ignorable="d">
 
 	<ResourceDictionary.MergedDictionaries>
-		<CupertinoColors xmlns="using:Uno.Cupertino"/>
+		<CupertinoColors xmlns="using:Uno.Cupertino" />
 	</ResourceDictionary.MergedDictionaries>
 
 	<Style x:Key="CupertinoProgressBarStyle"
-		   TargetType="winui:ProgressBar">
+		   TargetType="muxc:ProgressBar">
 		<Setter Property="Foreground"
 				Value="{StaticResource CupertinoBlueBrush}" />
 		<Setter Property="Background"

diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
@@ -1,39 +1,39 @@
 <ResourceDictionary 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"
-                    xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:not_win="http://uno.ui/not_win"
-                    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:winui="using:Microsoft.UI.Xaml.Controls"
-                    mc:Ignorable="d not_win">
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+					xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+					xmlns:not_win="http://uno.ui/not_win"
+					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+					mc:Ignorable="d not_win">
 
 	<ResourceDictionary.MergedDictionaries>
-		<CupertinoColors xmlns="using:Uno.Cupertino"/>
+		<CupertinoColors xmlns="using:Uno.Cupertino" />
 		<win:ResourceDictionary>
 			<lottie:LottieVisualSource x:Key="CupertinoDeterminateAnimation"
-			                           UriSource="ms-appx:///Uno.Cupertino/Assets/CupertinoProgressRing.json" />
+									   UriSource="ms-appx:///Uno.Cupertino/Assets/CupertinoProgressRing.json" />
 			<lottie:LottieVisualSource x:Key="CupertinoIndeterminateAnimation"
-			                           UriSource="ms-appx:///Uno.Cupertino/Assets/CupertinoProgressRing.json" />
+									   UriSource="ms-appx:///Uno.Cupertino/Assets/CupertinoProgressRing.json" />
 		</win:ResourceDictionary>
 		<not_win:ResourceDictionary>
 			<lottie:LottieVisualSource x:Key="CupertinoDeterminateAnimation"
-			                           UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
+									   UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
 			<lottie:LottieVisualSource x:Key="CupertinoIndeterminateAnimation"
-			                           UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
+									   UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
 		</not_win:ResourceDictionary>
 	</ResourceDictionary.MergedDictionaries>
 
 
 
 	<Style x:Key="CupertinoProgressRingStyle"
-	       TargetType="winui:ProgressRing">
+		   TargetType="muxc:ProgressRing">
 		<Setter Property="DeterminateSource"
-		        Value="{StaticResource CupertinoDeterminateAnimation}" />
+				Value="{StaticResource CupertinoDeterminateAnimation}" />
 		<Setter Property="IndeterminateSource"
-		        Value="{StaticResource CupertinoIndeterminateAnimation}" />
+				Value="{StaticResource CupertinoIndeterminateAnimation}" />
 		<Setter Property="Foreground"
-		        Value="{StaticResource CupertinoPrimaryGrayBrush}" />
+				Value="{StaticResource CupertinoPrimaryGrayBrush}" />
 	</Style>
 
 </ResourceDictionary>
diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
@@ -64,14 +64,14 @@
 			</PropertyGroup>
 
 			<ItemGroup>
-				<PackageReference Include="Uno.UI" Version="4.0.0-dev.5676" />
+				<PackageReference Include="Uno.UI" Version="4.0.7" />
 			</ItemGroup>
 			<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
 				<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210113001" />
 				<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie" Version="6.1.0" />
 			</ItemGroup>
 			<ItemGroup Condition="'$(TargetFramework)'!='uap10.0.18362'">
-				<PackageReference Include="Uno.UI.Lottie" Version="4.0.0-dev.5676" />
+				<PackageReference Include="Uno.UI.Lottie" Version="4.0.7" />
 			</ItemGroup>
 
 			<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">

diff --git a/src/library/Uno.Material/Controls/Ripple.cs b/src/library/Uno.Material/Controls/Ripple.cs
@@ -19,7 +19,7 @@
 using Windows.UI.Xaml.Media;
 #endif
 
-namespace Uno.Material.Controls
+namespace Uno.Material
 {
 	/*
 	 * Starting implementation acknowledgement from project https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/2740f14a814896d42032ae0013b765a8a0ec04c3/MaterialDesignThemes.Uwp/Ripple.cs

diff --git a/src/library/Uno.Material/Converters/FirstCharacterConverter.cs b/src/library/Uno.Material/Converters/FirstCharacterConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FirstCharacterConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/FromBoolToValueConverter.cs b/src/library/Uno.Material/Converters/FromBoolToValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FromBoolToValueConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/FromEmptyStringOrNullObjectToValueConverter.cs b/src/library/Uno.Material/Converters/FromEmptyStringOrNullObjectToValueConverter.cs
@@ -10,7 +10,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FromEmptyStringOrNullObjectToValueConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/FromEmptyStringToValueConverter.cs b/src/library/Uno.Material/Converters/FromEmptyStringToValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FromEmptyStringToValueConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/FromNullToValueConverter.cs b/src/library/Uno.Material/Converters/FromNullToValueConverter.cs
@@ -10,7 +10,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FromNullToValueConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/FromOpenToCustomValueConverter.cs b/src/library/Uno.Material/Converters/FromOpenToCustomValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class FromOpenToCustomValueConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/StringFormatConverter.cs b/src/library/Uno.Material/Converters/StringFormatConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class StringFormatConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Converters/ToUpperConverter.cs b/src/library/Uno.Material/Converters/ToUpperConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Material.Converters
+namespace Uno.Material
 {
 	public class ToUpperConverter : IValueConverter
 	{

diff --git a/src/library/Uno.Material/Extensions/ControlExtensions.cs b/src/library/Uno.Material/Extensions/ControlExtensions.cs
@@ -12,7 +12,7 @@
 using Windows.UI.Xaml.Controls;
 #endif
 
-namespace Uno.Material.Extensions
+namespace Uno.Material
 {
 	[Bindable]
 	public static class ControlExtensions

diff --git a/src/library/Uno.Material/Extensions/EnumerableExtensions.cs b/src/library/Uno.Material/Extensions/EnumerableExtensions.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Uno.Material.Extensions
+namespace Uno.Material
 {
 	internal static class EnumerableExtensions
 	{

diff --git a/src/library/Uno.Material/Extensions/StoryboardExtensions.cs b/src/library/Uno.Material/Extensions/StoryboardExtensions.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml.Media.Animation;
 #endif
 
-namespace Uno.Material.Extensions
+namespace Uno.Material
 {
 	internal static class StoryboardExtensions
 	{

diff --git a/src/library/Uno.Material/Helpers/ControlHelper.cs b/src/library/Uno.Material/Helpers/ControlHelper.cs
@@ -10,7 +10,7 @@
 using Windows.UI.Xaml.Controls;
 #endif
 
-namespace Uno.Material.Helpers
+namespace Uno.Material
 {
 	internal static class ControlHelper
 	{

diff --git a/src/library/Uno.Material/LinkerConfig.xml b/src/library/Uno.Material/LinkerConfig.xml
@@ -1,6 +1,6 @@
 <linker>
 	<assembly fullname="Uno.Material">
 		<!-- required for attached properties to persist -->
-		<type fullname="Uno.Material.Extensions*" />
+		<type fullname="Uno.Material*" />
 	</assembly>
 </linker>
diff --git a/src/library/Uno.Material/Styles/Application/Converters.xaml b/src/library/Uno.Material/Styles/Application/Converters.xaml
@@ -1,49 +1,50 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					xmlns:converters="using:Uno.Material.Converters">
+					xmlns:um="using:Uno.Material">
 
-	<converters:FromBoolToValueConverter x:Name="MaterialTrueToVisible"
-										 TrueValue="Visible"
-										 FalseValue="Collapsed"
-										 NullValue="Collapsed" />
+	<um:FromBoolToValueConverter x:Name="MaterialTrueToVisible"
+								 TrueValue="Visible"
+								 FalseValue="Collapsed"
+								 NullValue="Collapsed" />
 
-	<converters:FromBoolToValueConverter x:Name="MaterialTrueToCollapsed"
-										 TrueValue="Collapsed"
-										 FalseValue="Visible"
-										 NullValue="Visible" />
-
-	<converters:FromEmptyStringToValueConverter x:Key="MaterialEmptyToFalse"
-												NotNullOrEmptyValue="True"
-												NullOrEmptyValue="False" />
+	<um:FromBoolToValueConverter x:Name="MaterialTrueToCollapsed"
+								 TrueValue="Collapsed"
+								 FalseValue="Visible"
+								 NullValue="Visible" />
+
+	<um:FromEmptyStringToValueConverter x:Key="MaterialEmptyToFalse"
+										NotNullOrEmptyValue="True"
+										NullOrEmptyValue="False" />
+
+	<um:FromEmptyStringToValueConverter x:Key="MaterialEmptyToTrue"
+										NotNullOrEmptyValue="False"
+										NullOrEmptyValue="True" />
 
-	<converters:FromEmptyStringToValueConverter x:Key="MaterialEmptyToTrue"
-												NotNullOrEmptyValue="False"
-												NullOrEmptyValue="True" />
+	<um:FromEmptyStringToValueConverter x:Key="MaterialEmptyToVisible"
+										NotNullOrEmptyValue="Collapsed"
+										NullOrEmptyValue="Visible" />
 
-	<converters:FromEmptyStringToValueConverter x:Key="MaterialEmptyToVisible"
-												NotNullOrEmptyValue="Collapsed"
-												NullOrEmptyValue="Visible" />
+	<um:FromEmptyStringToValueConverter x:Key="MaterialEmptyToCollapsed"
+										NotNullOrEmptyValue="Visible"
+										NullOrEmptyValue="Collapsed" />
 
-	<converters:FromEmptyStringToValueConverter x:Key="MaterialEmptyToCollapsed"
-												NotNullOrEmptyValue="Visible"
-												NullOrEmptyValue="Collapsed" />
+	<um:FromNullToValueConverter x:Key="MaterialNullToCollapsedConverter"
+								 NotNullValue="Visible"
+								 NullValue="Collapsed" />
 
-	<converters:FromNullToValueConverter x:Key="MaterialNullToCollapsedConverter"
-										 NotNullValue="Visible"
-										 NullValue="Collapsed" />
+	<um:FromNullToValueConverter x:Key="MaterialNullToVisibleConverter"
+								 NotNullValue="Visible"
+								 NullValue="Collapsed" />
 
-	<converters:FromNullToValueConverter x:Key="MaterialNullToVisibleConverter"
-										 NotNullValue="Visible"
-										 NullValue="Collapsed" />
+	<um:FromEmptyStringOrNullObjectToValueConverter x:Key="MaterialEmptyOrNullToVisible"
+													NotEmptyOrNullValue="Collapsed"
+													EmptyOrNullValue="Visible" />
 
-	<converters:FromEmptyStringOrNullObjectToValueConverter x:Key="MaterialEmptyOrNullToVisible"
-															NotEmptyOrNullValue="Collapsed"
-															EmptyOrNullValue="Visible" />
+	<um:FromEmptyStringOrNullObjectToValueConverter x:Key="MaterialEmptyOrNullToCollapsed"
+													NotEmptyOrNullValue="Visible"
+													EmptyOrNullValue="Collapsed" />
 
-	<converters:FromEmptyStringOrNullObjectToValueConverter x:Key="MaterialEmptyOrNullToCollapsed"
-															NotEmptyOrNullValue="Visible"
-															EmptyOrNullValue="Collapsed" />
+	<um:StringFormatConverter x:Key="StringFormatConverter" />
+	<um:FirstCharacterConverter x:Key="FirstCharacterConverter" />
 
-	<converters:StringFormatConverter x:Key="StringFormatConverter"/>
-	<converters:FirstCharacterConverter x:Key="FirstCharacterConverter" />
 </ResourceDictionary>