feat: Support WUX ProgressRing everywhere

unoplatform · Mar 11, 2022 · eb13011 · eb13011
1 parent 794c755
commit eb13011
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 79 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.cs b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.cs
@@ -1,4 +1,3 @@
-#if XAMARIN || UNO_REFERENCE_API
 using System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -15,7 +14,6 @@ public ProgressRing()
 			DefaultStyleKey = typeof(ProgressRing);
 		}
 
-
 		/// <summary>
 		/// Gets or sets a value that indicates whether the <see cref="ProgressRing"/> is showing progress.
 		/// </summary>
@@ -45,8 +43,6 @@ private static void OnIsActiveChanged(DependencyObject dependencyObject, Depende
 
 		partial void OnIsActiveChangedPartial(bool isActive);
 
-#if !UNO_REFERENCE_API && !__MACOS__ && !__NETSTD_REFERENCE__
-
 		private protected override void OnLoaded()
 		{
 			base.OnLoaded();
@@ -64,7 +60,6 @@ private protected override void OnUnloaded()
 
 			OnUnloadedPartial();
 		}
-#endif
 
 		public Primitives.ProgressRingTemplateSettings TemplateSettings
 		{
@@ -84,4 +79,3 @@ public Primitives.ProgressRingTemplateSettings TemplateSettings
 		}
 	}
 }
-#endif
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.macOS.cs b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.macOS.cs
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.net.cs b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.net.cs
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.netstdref.cs b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.netstdref.cs
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.skia.cs b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.skia.cs
diff --git a/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.xaml b/src/Uno.UI/UI/Xaml/Controls/ProgressRing/ProgressRing.xaml
@@ -13,13 +13,13 @@
 
 
 	<!-- Default style for Windows.UI.Xaml.Controls.ProgressRing -->
-    <wasm:Style x:Key="ProgressRingEllipseStyle" TargetType="Ellipse">
+    <Style x:Key="ProgressRingEllipseStyle" TargetType="Ellipse">
 	    <Setter Property="Opacity" Value="0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
-    </wasm:Style>
+    </Style>
 
-	<wasm:Style TargetType="ProgressRing">
+	<Style TargetType="ProgressRing">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Foreground" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
 		<Setter Property="IsHitTestVisible" Value="False" />
@@ -280,9 +280,9 @@
 		    </ControlTemplate>
 		  </Setter.Value>
 		</Setter>
-	</wasm:Style>
+	</Style>
 
-	<android:Style TargetType="ProgressRing">
+	<android:Style TargetType="ProgressRing" x:Key="NativeProgressRingStyle">
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ProgressRing">
@@ -292,7 +292,7 @@
 		</Setter>
 	</android:Style>
 
-	<ios:Style TargetType="ProgressRing">
+	<ios:Style TargetType="ProgressRing" x:Key="NativeProgressRingStyle">
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ProgressRing">

diff --git a/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml b/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml
@@ -12498,12 +12498,12 @@
     </Setter>
   </Style>
   <!--origin: UI\Xaml\Controls\ProgressRing\ProgressRing.xaml-->
-  <wasm:Style x:Key="ProgressRingEllipseStyle" TargetType="Ellipse">
+  <Style x:Key="ProgressRingEllipseStyle" TargetType="Ellipse">
     <Setter Property="Opacity" Value="0" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Top" />
-  </wasm:Style>
-  <wasm:Style TargetType="ProgressRing">
+  </Style>
+  <Style TargetType="ProgressRing">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Foreground" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
     <Setter Property="IsHitTestVisible" Value="False" />
@@ -12677,8 +12677,8 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </wasm:Style>
-  <android:Style TargetType="ProgressRing">
+  </Style>
+  <android:Style TargetType="ProgressRing" x:Key="NativeProgressRingStyle">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="ProgressRing">
@@ -12687,7 +12687,7 @@
       </Setter.Value>
     </Setter>
   </android:Style>
-  <ios:Style TargetType="ProgressRing">
+  <ios:Style TargetType="ProgressRing" x:Key="NativeProgressRingStyle">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="ProgressRing">