aktueller Stand

FasdDesktopUi/Basics/UserControls/Badge.xaml

@@ -3,70 +3,25 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:FasdDesktopUi.Basics.UserControls"
+             xmlns:ico="clr-namespace:FasdDesktopUi.Basics.UserControls.AdaptableIcon;assembly=F4SD-AdaptableIcon"
              mc:Ignorable="d"
              d:DesignHeight="20"
              d:DesignWidth="40"
-             x:Name="BadgeControl"
-             Loaded="BadgeControl_Loaded"
-             Unloaded="BadgeControl_Unloaded">
+             x:Name="BadgeControl">
 
-    <Grid ClipToBounds="False">
-        <Border Background="{DynamicResource Color.SoftContrast}"
-                CornerRadius="5">
-            <StackPanel HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal"
-                        Margin="7.5 2.5">
-                <TextBlock FontSize="12"
-                           FontWeight="Bold"
-                           Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
-                           Text="{Binding ElementName=BadgeControl, Path=Text}" />
-            </StackPanel>
-        </Border>
+    <Border Background="{DynamicResource Color.SoftContrast}"
+            CornerRadius="5">
 
-        <Canvas x:Name="SparkleCanvas"
-                IsHitTestVisible="False"
-                ClipToBounds="False"
-                Visibility="Collapsed">
-            <Grid x:Name="SparkleTopRight"
-                  Canvas.Right="-3"
-                  Canvas.Top="-4"
-                  Opacity="0"
-                  RenderTransformOrigin="0.5,0.5">
-                <Grid.RenderTransform>
-                    <ScaleTransform ScaleX="0.6" ScaleY="0.6" />
-                </Grid.RenderTransform>
-                <Rectangle Width="2"
-                           Height="8"
-                           RadiusX="1"
-                           RadiusY="1"
-                           Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
-                <Rectangle Width="8"
-                           Height="2"
-                           RadiusX="1"
-                           RadiusY="1"
-                           Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
-            </Grid>
+        <StackPanel HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal"
+                    Margin="7.5 2.5">
+            <TextBlock FontSize="12"
+                       FontWeight="Bold"
+                       Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
+                       Text="{Binding ElementName=BadgeControl, Path=Text}" />
+        </StackPanel>
 
-            <Grid x:Name="SparkleBottomLeft"
-                  Canvas.Left="-3"
-                  Canvas.Bottom="-4"
-                  Opacity="0"
-                  RenderTransformOrigin="0.5,0.5">
-                <Grid.RenderTransform>
-                    <ScaleTransform ScaleX="0.6" ScaleY="0.6" />
-                </Grid.RenderTransform>
-                <Rectangle Width="2"
-                           Height="8"
-                           RadiusX="1"
-                           RadiusY="1"
-                           Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
-                <Rectangle Width="8"
-                           Height="2"
-                           RadiusX="1"
-                           RadiusY="1"
-                           Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
-            </Grid>
-        </Canvas>
-    </Grid>
+    </Border>
 </UserControl>

FasdDesktopUi/Basics/UserControls/Badge.xaml.cs

@@ -1,16 +1,10 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
 
 namespace FasdDesktopUi.Basics.UserControls
 {
     public partial class Badge : UserControl
     {
-        private readonly Storyboard _sparkleStoryboard;
-        private const double SparkleBaseScale = 0.6;
-
         public string Text
         {
             get { return (string)GetValue(TextProperty); }
@@ -20,118 +14,10 @@ namespace FasdDesktopUi.Basics.UserControls
         public static readonly DependencyProperty TextProperty =
             DependencyProperty.Register(nameof(Text), typeof(string), typeof(Badge), new PropertyMetadata("Beta"));
 
-        public bool IsSparkleEnabled
-        {
-            get { return (bool)GetValue(IsSparkleEnabledProperty); }
-            set { SetValue(IsSparkleEnabledProperty, value); }
-        }
-
-        public static readonly DependencyProperty IsSparkleEnabledProperty =
-            DependencyProperty.Register(nameof(IsSparkleEnabled), typeof(bool), typeof(Badge), new PropertyMetadata(false, OnIsSparkleEnabledChanged));
-
 
         public Badge()
         {
             InitializeComponent();
-            _sparkleStoryboard = CreateSparkleStoryboard();
-            UpdateSparkleState();
-        }
-
-        private static void OnIsSparkleEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var control = d as Badge;
-            control?.UpdateSparkleState();
-        }
-
-        private void BadgeControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            UpdateSparkleState();
-        }
-
-        private void BadgeControl_Unloaded(object sender, RoutedEventArgs e)
-        {
-            StopSparkles();
-        }
-
-        private void UpdateSparkleState()
-        {
-            if (SparkleCanvas == null || _sparkleStoryboard == null)
-            {
-                return;
-            }
-
-            if (IsSparkleEnabled)
-            {
-                SparkleCanvas.Visibility = Visibility.Visible;
-                _sparkleStoryboard.Begin(this, true);
-                return;
-            }
-
-            SparkleCanvas.Visibility = Visibility.Collapsed;
-            StopSparkles();
-        }
-
-        private void StopSparkles()
-        {
-            _sparkleStoryboard?.Stop(this);
-
-            if (SparkleTopRight != null)
-            {
-                SparkleTopRight.Opacity = 0;
-                if (SparkleTopRight.RenderTransform is ScaleTransform topTransform)
-                {
-                    topTransform.ScaleX = SparkleBaseScale;
-                    topTransform.ScaleY = SparkleBaseScale;
-                }
-            }
-
-            if (SparkleBottomLeft != null)
-            {
-                SparkleBottomLeft.Opacity = 0;
-                if (SparkleBottomLeft.RenderTransform is ScaleTransform bottomTransform)
-                {
-                    bottomTransform.ScaleX = SparkleBaseScale;
-                    bottomTransform.ScaleY = SparkleBaseScale;
-                }
-            }
-        }
-
-        private Storyboard CreateSparkleStoryboard()
-        {
-            var storyboard = new Storyboard
-            {
-                RepeatBehavior = RepeatBehavior.Forever
-            };
-
-            AddKeyFrames(storyboard, SparkleTopRight, "Opacity",
-                (0.00, 0.0), (0.18, 1.0), (0.42, 0.0), (2.20, 0.0));
-            AddKeyFrames(storyboard, SparkleTopRight, "(UIElement.RenderTransform).(ScaleTransform.ScaleX)",
-                (0.00, SparkleBaseScale), (0.22, 1.15), (0.42, SparkleBaseScale), (2.20, SparkleBaseScale));
-            AddKeyFrames(storyboard, SparkleTopRight, "(UIElement.RenderTransform).(ScaleTransform.ScaleY)",
-                (0.00, SparkleBaseScale), (0.22, 1.15), (0.42, SparkleBaseScale), (2.20, SparkleBaseScale));
-
-            AddKeyFrames(storyboard, SparkleBottomLeft, "Opacity",
-                (0.00, 0.0), (1.00, 0.0), (1.18, 1.0), (1.42, 0.0), (2.20, 0.0));
-            AddKeyFrames(storyboard, SparkleBottomLeft, "(UIElement.RenderTransform).(ScaleTransform.ScaleX)",
-                (0.00, SparkleBaseScale), (1.00, SparkleBaseScale), (1.22, 1.15), (1.42, SparkleBaseScale), (2.20, SparkleBaseScale));
-            AddKeyFrames(storyboard, SparkleBottomLeft, "(UIElement.RenderTransform).(ScaleTransform.ScaleY)",
-                (0.00, SparkleBaseScale), (1.00, SparkleBaseScale), (1.22, 1.15), (1.42, SparkleBaseScale), (2.20, SparkleBaseScale));
-
-            return storyboard;
-        }
-
-        private static void AddKeyFrames(Storyboard storyboard, DependencyObject target, string targetProperty, params (double TimeSeconds, double Value)[] frames)
-        {
-            var animation = new DoubleAnimationUsingKeyFrames();
-
-            foreach (var frame in frames)
-            {
-                animation.KeyFrames.Add(new LinearDoubleKeyFrame(frame.Value, KeyTime.FromTimeSpan(TimeSpan.FromSeconds(frame.TimeSeconds))));
-            }
-
-            Storyboard.SetTarget(animation, target);
-            Storyboard.SetTargetProperty(animation, new PropertyPath(targetProperty));
-            storyboard.Children.Add(animation);
         }
     }
 }