feat(progressbar): use WinUI template

unoplatform · Jun 16, 2020 · c4a3ba6 · c4a3ba6
1 parent 9d3da6e
commit c4a3ba6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/...amplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ProgressBar/WinUIProgressBarPage.xaml b/...amplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ProgressBar/WinUIProgressBarPage.xaml
@@ -43,7 +43,7 @@
 				VerticalAlignment="Center"
 				AutomationProperties.Name="TestProgressBar"
 				HorizontalAlignment="Left"
-				IsIndeterminate="{x:Bind ShowIsDeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"
+				IsIndeterminate="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"
 				ShowPaused="{x:Bind ShowPausedCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"
 				ShowError="{x:Bind ShowErrorCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"/>
 		</StackPanel>
@@ -102,7 +102,7 @@
 				<TextBlock Text="States"/>
 				<CheckBox x:Name="ShowPausedCheckBox" AutomationProperties.Name="ShowPausedCheckBox" Content="ShowPaused" />
 				<CheckBox x:Name="ShowErrorCheckBox" AutomationProperties.Name="ShowErrorCheckBox"  Content="ShowError"/>
-				<CheckBox x:Name="ShowIsDeterminateCheckBox" AutomationProperties.Name="ShowIsDeterminateCheckBox" Content="IsDeterminate"/>
+				<CheckBox x:Name="ShowIsIndeterminateCheckBox" AutomationProperties.Name="ShowIsIndeterminateCheckBox" Content="IsIndeterminate"/>
 			</StackPanel>
 
 			<StackPanel Margin="0,16,0,0">
@@ -129,7 +129,7 @@
 			<TextBlock AutomationProperties.Name="ShowErrorText" Text="{x:Bind ShowErrorCheckBox.IsChecked, Mode=OneWay}"/>
 
 			<TextBlock Text="Is indeterminate:" Margin="0, 20, 0, 0" FontSize="20"/>
-			<TextBlock AutomationProperties.Name="ShowIsDeterminateText" Text="{x:Bind ShowIsDeterminateCheckBox.IsChecked, Mode=OneWay}"/>
+			<TextBlock AutomationProperties.Name="ShowIsIndeterminateText" Text="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Mode=OneWay}"/>
 
 			<TextBlock x:Name="VisualStateText" AutomationProperties.Name="VisualStateText" Margin="0, 20, 0, 0"/>
 		</StackPanel>

diff --git a/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ProgressBar/WinUIProgressBarPage.xaml.cs b/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ProgressBar/WinUIProgressBarPage.xaml.cs
@@ -9,7 +9,7 @@
 
 namespace UITests.Microsoft_UI_Xaml_Controls.ProgressBar
 {
-	[Sample("ProgressBar", "WinUI")]
+	[Sample("Progress", "WinUI")]
 	public sealed partial class WinUIProgressBarPage : Page
 	{
 		public WinUIProgressBarPage()

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ProgressBar/ProgressBar.xaml b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ProgressBar/ProgressBar.xaml
@@ -41,7 +41,7 @@
 								<VisualStateGroup.Transitions>
 									<VisualTransition From="Updating" To="Determinate">
 										<Storyboard>
-											<RepositionThemeAnimation TargetName="DeterminateProgressBarIndicator" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IndicatorLengthDelta}" />
+											<!--<RepositionThemeAnimation TargetName="DeterminateProgressBarIndicator" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IndicatorLengthDelta}" />-->
 										</Storyboard>
 									</VisualTransition>
 									<VisualTransition From="Paused" To="Determinate">
@@ -103,7 +103,7 @@
                                             Storyboard.TargetProperty="Opacity"
                                             To="1"
                                             Duration="0" />
-										<!--<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />-->
+										<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />
 									</Storyboard>
 								</VisualState>
 								<VisualState x:Name="IndeterminateError">
@@ -143,7 +143,7 @@
 											<LinearColorKeyFrame Value="{ThemeResource SystemBaseLowColor}" KeyTime="0:0:2.75" />
 											<LinearColorKeyFrame Value="{StaticResource SystemControlErrorBackgroundColor}" KeyTime="0:0:3" />
 										</ColorAnimationUsingKeyFrames>
-										<!--<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />-->
+										<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />
 									</Storyboard>
 								</VisualState>
 								<VisualState x:Name="Error">
@@ -166,7 +166,6 @@
                                             Storyboard.TargetName="IndeterminateProgressBarIndicator"
                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
 											<SplineDoubleKeyFrame KeyTime="0:0:1" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContainerAnimationEndPosition}" KeySpline="0.4, 0.0, 0.6, 1.0" />
-
 										</DoubleAnimationUsingKeyFrames>
 										<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="IndeterminateProgressBarIndicator">
 											<DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
@@ -192,7 +191,7 @@
 											<LinearColorKeyFrame Value="{ThemeResource SystemAccentColor}" KeyTime="0:0:2.5" />
 											<LinearColorKeyFrame Value="{ThemeResource SystemBaseMediumLowColor}" KeyTime="0:0:2.75" />
 										</ColorAnimationUsingKeyFrames>
-										<!--<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />-->
+										<FadeOutThemeAnimation TargetName="DeterminateProgressBarIndicator" />
 									</Storyboard>
 								</VisualState>
 								<VisualState x:Name="Paused">
@@ -225,12 +224,10 @@
                                         Margin="{TemplateBinding Padding}"
                                         Fill="{TemplateBinding Foreground}"         
                                         HorizontalAlignment="Left"
-                                        RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                                        RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}">
-										<!--contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+										contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
                                         contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
                                         contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}">-->
+                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}">
 									</Rectangle>
 
 									<Rectangle x:Name="IndeterminateProgressBarIndicator"

diff --git a/src/Uno.UI/UI/Xaml/Media/Animation/DoubleAnimationUsingKeyFrames.Android.cs b/src/Uno.UI/UI/Xaml/Media/Animation/DoubleAnimationUsingKeyFrames.Android.cs
@@ -9,17 +9,18 @@ namespace Windows.UI.Xaml.Media.Animation
 {
     public partial class DoubleAnimationUsingKeyFrames
     {
-		private bool _errorReported;
+		//private bool _errorReported;
 
 		// This class is not implemented for Android
 		partial void OnFrame(IValueAnimator currentAnimator)
 		{
-			if(!_errorReported && this.Log().IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error))
-			{
-				_errorReported = true;
+			SetValue(currentAnimator.AnimatedValue);
+			//if (!_errorReported && this.Log().IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error))
+			//{
+			//	_errorReported = true;
 
-				this.Log().Error($"{GetType()} is not supported on this platform.");
-			}
+			//	this.Log().Error($"{GetType()} is not supported on this platform.");
+			//}
 		}
 
 		// For performance consideration, do not report each frame if we are GPU bound