Merge pull request #690 from unoplatform/dev/agzi/MoveUnderUnoCupertino

refactor!: Move everything under the Uno.Cupertino namespace
unoplatform · Dec 2, 2021 · 149fca4 · 149fca4
2 parents 6a2515e + ac6f16b
commit 149fca4
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 36 deletions.
diff --git a/src/library/Uno.Cupertino/Converters/FromEmptyStringToValueConverter.cs b/src/library/Uno.Cupertino/Converters/FromEmptyStringToValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 #endif
 
-namespace Uno.Cupertino.Converters
+namespace Uno.Cupertino
 {
 	public class FromEmptyStringToValueConverter : IValueConverter
 	{

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

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

diff --git a/src/library/Uno.Cupertino/Styles/Application/Converters.xaml b/src/library/Uno.Cupertino/Styles/Application/Converters.xaml
@@ -1,18 +1,19 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="using:Uno.Cupertino.Converters">
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:uc="using:Uno.Cupertino">
 
-	<converters:FromEmptyStringToValueConverter x:Key="CupertinoEmptyToFalse"
-	                                            NotNullOrEmptyValue="True"
-	                                            NullOrEmptyValue="False" />
+	<uc:FromEmptyStringToValueConverter x:Key="CupertinoEmptyToFalse"
+										NotNullOrEmptyValue="True"
+										NullOrEmptyValue="False" />
 
-	<converters:FromEmptyStringToValueConverter x:Key="CupertinoEmptyToTrue"
-	                                            NotNullOrEmptyValue="False"
-	                                            NullOrEmptyValue="True" />
+	<uc:FromEmptyStringToValueConverter x:Key="CupertinoEmptyToTrue"
+										NotNullOrEmptyValue="False"
+										NullOrEmptyValue="True" />
 
-	<converters:FromNullToValueConverter x:Key="CupertinoNullToCollapsedConverter"
-	                                     NotNullValue="Visible"
-	                                     NullValue="Collapsed" />
+	<uc:FromNullToValueConverter x:Key="CupertinoNullToCollapsedConverter"
+								 NotNullValue="Visible"
+								 NullValue="Collapsed" />
 
-	<converters:StringFormatConverter x:Key="StringFormatConverter" />
+	<uc:StringFormatConverter x:Key="StringFormatConverter" />
+
 </ResourceDictionary>
diff --git a/src/library/Uno.Cupertino/Styles/Controls/ComboBox.xaml b/src/library/Uno.Cupertino/Styles/Controls/ComboBox.xaml
@@ -1,23 +1,21 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:converters="using:Uno.Cupertino.Converters"
-					xmlns:toolkit="using:Uno.UI.Toolkit"
+					xmlns:uc="using:Uno.Cupertino"
 					xmlns:uno="using:Uno.UI.Xaml.Controls"
-					xmlns:win="using:Uno.UI.Toolkit"
 					xmlns:xamarin="http://nventive.com/xamarin"
 					mc:Ignorable="xamarin">
 
 	<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/StateConstants.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 
 	<!-- Converters -->
-	<converters:FromNullToValueConverter x:Name="NullToVisible"
-										 NotNullValue="Collapsed"
-										 NullValue="Visible" />
+	<uc:FromNullToValueConverter x:Name="NullToVisible"
+								 NotNullValue="Collapsed"
+								 NullValue="Visible" />
 
 	<!-- Brushes -->
 	<StaticResource x:Key="ComboBoxBackgroundColorBrush"

diff --git a/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml b/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml
@@ -1,15 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:converters="using:Uno.Cupertino.Converters"
-					xmlns:controls="using:Uno.Cupertino.Controls"
 					xmlns:toolkit="using:Uno.UI.Toolkit"
 					xmlns:not_win="http://uno.ui/not_win"
 					mc:Ignorable="not_win">
 
 	<ResourceDictionary.MergedDictionaries>
-		<CupertinoColors xmlns="using:Uno.Cupertino"/>
-		<CupertinoFonts xmlns="using:Uno.Cupertino"/>
+		<CupertinoColors xmlns="using:Uno.Cupertino" />
+		<CupertinoFonts xmlns="using:Uno.Cupertino" />
 	</ResourceDictionary.MergedDictionaries>
 
 	<SolidColorBrush x:Key="CupertinoSliderTrackBrush"

diff --git a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/App.xaml b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/App.xaml
@@ -1,8 +1,6 @@
 <Application x:Class="Uno.Themes.Samples.App"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:material="using:Uno.Material"
-			 xmlns:toolkit="using:Uno.UI.Toolkit">
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
 	<Application.Resources>
 		<ResourceDictionary>
@@ -18,7 +16,7 @@
 
 				<CupertinoColors xmlns="using:Uno.Cupertino" />
 				<CupertinoFonts xmlns="using:Uno.Cupertino"
-								OverrideSource="ms-appx:///CupertinoFontsOverride.xaml"/>
+								OverrideSource="ms-appx:///CupertinoFontsOverride.xaml" />
 				<CupertinoResources xmlns="using:Uno.Cupertino" />
 
 				<ResourceDictionary Source="Converters.xaml" />

diff --git a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Shell.xaml b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Shell.xaml
@@ -2,13 +2,9 @@
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:local="using:Uno.Gallery"
-			 xmlns:not_wasm="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-			 xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:wasm="http://uno.ui/wasm"
 			 xmlns:xamarin="http://uno.ui/xamarin"
-			 mc:Ignorable="wasm xamarin">
+			 mc:Ignorable="xamarin">
 
 	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">